1. 08 9月, 2016 3 次提交
  2. 30 8月, 2016 1 次提交
  3. 25 8月, 2016 1 次提交
    • S
      Handle non-UTF-8 conflicts gracefully · 44eb3197
      Sean McGivern 提交于
      These can't be resolved in the UI because if they aren't in a UTF-8
      compatible encoding, they can't be rendered as JSON. Even if they could,
      we would be implicitly changing the file encoding anyway, which seems
      like a bad idea.
      44eb3197
  4. 24 8月, 2016 2 次提交
  5. 23 8月, 2016 2 次提交
  6. 22 8月, 2016 2 次提交
  7. 21 8月, 2016 1 次提交
  8. 19 8月, 2016 1 次提交
  9. 18 8月, 2016 2 次提交
  10. 17 8月, 2016 4 次提交
  11. 16 8月, 2016 1 次提交
  12. 13 8月, 2016 5 次提交
    • P
      Updated tests · f668da11
      Phil Hughes 提交于
      f668da11
    • R
      New Notes::SlashCommandsService service · 7cc4ab14
      Rémy Coutable 提交于
      Check for update_issuable permission in Notes::SlashCommandsService
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      7cc4ab14
    • R
      Support slash commands in noteable description and notes · 0eea8c88
      Rémy Coutable 提交于
      Some important things to note:
      
      - commands are removed from noteable.description / note.note
      - commands are translated to params so that they are treated as normal
        params in noteable Creation services
      - the logic is not in the models but in the Creation services, which is
        the right place for advanced logic that has nothing to do with what
        models should be responsible of!
      - UI/JS needs to be updated to handle notes which consist of commands
        only
      - the `/merge` command is not handled yet
      
      Other improvements:
      
      - Don't process commands in commit notes and display a flash is note is only commands
      - Add autocomplete for slash commands
      - Add description and params to slash command DSL methods
      - Ensure replying by email with a commands-only note works
      - Use :subscription_event instead of calling noteable.subscribe
      - Support :todo_event in IssuableBaseService
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      0eea8c88
    • F
      Fix failed test because of a copy change. · f6aa9170
      Fatih Acet 提交于
      f6aa9170
    • S
      Add more tests for conflicts · ce7eb4e4
      Sean McGivern 提交于
      ce7eb4e4
  13. 12 8月, 2016 1 次提交
  14. 11 8月, 2016 2 次提交
    • K
      Pre-create all builds for Pipeline when a trigger is received · 39203f1a
      Kamil Trzcinski 提交于
      This change simplifies a Pipeline processing by introducing a special new status: created.
      This status is used for all builds that are created for a pipeline.
      We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped).
      This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled.
      This also allows us to visualise a full pipeline (with created builds).
      
      This also removes an after_touch used for updating a pipeline state parameters.
      Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
      39203f1a
    • P
      bbb01909
  15. 10 8月, 2016 1 次提交
  16. 09 8月, 2016 1 次提交
  17. 05 8月, 2016 1 次提交
  18. 02 8月, 2016 2 次提交
  19. 01 8月, 2016 2 次提交
    • Z
      State specific default sort order for issuables · 84a3225b
      zs 提交于
      Provide more sensible default sort order for issues and merge requests
      based on the following table:
      
      | type           | state  | default sort order |
      |----------------|--------|--------------------|
      | issues         | open   | last created       |
      | issues         | closed | last updated       |
      | issues         | all    | last created       |
      | merge requests | open   | last created       |
      | merge requests | merged | last updated       |
      | merge requests | closed | last updated       |
      | merge requests | all    | last created       |
      84a3225b
    • P
      Updated issues with jump tp button · c51cbc1f
      Phil Hughes 提交于
      Fixed styling bugs
      c51cbc1f
  20. 29 7月, 2016 5 次提交