- 11 Nov, 2016 1 commit
-
-
Alex Sanford authored
Previously, they were only being loaded on the actual `show` action, but not the actions representing the tabs (commits, builds, etc).
-
- 04 Nov, 2016 2 commits
-
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rodolfo Santos authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 20 Oct, 2016 1 commit
-
-
Z.J. van de Weg authored
-
- 14 Oct, 2016 1 commit
-
-
Z.J. van de Weg authored
-
- 13 Oct, 2016 5 commits
-
-
Sean McGivern authored
-
Alfredo Sumaran authored
-
Sean McGivern authored
-
Sean McGivern authored
-
Sean McGivern authored
When reading conflicts: 1. Add a `type` field. `text` works as before, and has `sections`; `text-editor` is a file with ambiguous conflict markers that can only be resolved in an editor. 2. Add a `content_path` field pointing to a JSON representation of the file's content for a single file. 3. Hitting `content_path` returns a similar datastructure to the `file`, but without the `content_path` and `sections` fields, and with a `content` field containing the full contents of the file (with conflict markers). When writing conflicts: 1. Instead of `sections` being at the top level, they are now in a `files` array. This matches the read format better. 2. The `files` array contains file hashes, each of which must contain: a. `new_path` b. `old_path` c. EITHER `sections` (which works as before) or `content` (with the full content of the resolved file).
-
- 10 Oct, 2016 1 commit
-
-
James Edwards-Jones authored
-
- 07 Oct, 2016 1 commit
-
-
James Edwards-Jones authored
-
- 06 Oct, 2016 1 commit
-
-
James authored
-
- 03 Oct, 2016 1 commit
-
-
Thomas Balthazar authored
It toggles the 'WIP' prefix in the MR title.
-
- 08 Sep, 2016 1 commit
-
-
Douglas Barbosa Alexandre authored
-
- 30 Aug, 2016 2 commits
-
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
Add test for closed MR without fork Add view test visibility of Reopen and Close buttons Fix controller tests and validation method Fix missing space Remove unused variables from test closed_without_fork? method refactoring Add information about missing fork When closed MR without fork can't edit target branch Tests for closed MR edit view Fix indentation and rebase, refactoring
-
- 12 Aug, 2016 7 commits
-
-
Sean McGivern authored
-
Sean McGivern authored
This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede.
-
Sean McGivern authored
-
Sean McGivern authored
-
Sean McGivern authored
-
Sean McGivern authored
-
Sean McGivern authored
-
- 09 Aug, 2016 1 commit
-
-
tiagonbotelho authored
-
- 03 Aug, 2016 2 commits
-
-
Paco Guzman authored
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
-
Paco Guzman authored
Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
-
- 11 Jul, 2016 1 commit
-
-
Sean McGivern authored
-
- 08 Jul, 2016 2 commits
-
-
Sean McGivern authored
-
Sean McGivern authored
When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
-
- 06 Jul, 2016 2 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
- 01 Jul, 2016 1 commit
-
-
Grzegorz Bizon authored
-
- 28 Jun, 2016 1 commit
-
-
Z.J. van de Weg authored
Depends on the changes in Workhorse (gitlab-org/gitlab-workhorse!48).
-
- 27 Jun, 2016 1 commit
-
-
Z.J. van de Weg authored
-
- 24 Jun, 2016 1 commit
-
-
Rémy Coutable authored
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true The issue was that `MergeRequest#mergeable?` returns false when the CI state is not success and project.only_allow_merge_if_build_succeeds is true. In this case `Projects::MergeRequestsController#merge` would return the `:failed` status when enabling `merge_when_build_succeeds`, thus leading to a weird state and the MR never automatically merged. The fix is to disable the CI state check in the controller safeguard that early return the `:failed` status. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 03 Jun, 2016 4 commits
-
-
Zeger-Jan van de Weg authored
-
Kamil Trzcinski authored
-
James Lopez authored
This reverts commit 3e991230.
-
James Lopez authored
# Conflicts: # app/models/project.rb
-