- 15 Jan, 2016 1 commit
-
-
Robert Speicher authored
-
- 14 Jan, 2016 2 commits
-
-
Robert Speicher authored
Remove duplicate cross-project reference from sidebar Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/7962 [ci skip] See merge request !114
-
Robert Speicher authored
[ci skip]
-
- 13 Jan, 2016 20 commits
-
-
Douwe Maan authored
Fast-forward merge when build succeeds + semi-linear history rebasing and merge commits. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/28. I'll backport 1d6c271e and 9292d8e6 to CE. To do: - [x] Test - [x] More screenshots :) ## Settings Old: ![Screen_Shot_2016-01-07_at_16.56.42](/uploads/b5a8db9d761a5442d8787ea4913f6f93/Screen_Shot_2016-01-07_at_16.56.42.png) (The "Rebase button" option used to only be available when "Only fast-forward merges" is checked) New: ![Screen_Shot_2016-01-07_at_16.57.57](/uploads/1a000cc8bd02aa9e5b053cb52ed8c3c8/Screen_Shot_2016-01-07_at_16.57.57.png) ## Merge widget ### With "Fast-forward merge" or "Merge commit with semi-linear history", when ff merge is NOT possible ![Screen_Shot_2016-01-12_at_16.21.16](/uploads/e3e1ec924b9783b01054fea1446c8235/Screen_Shot_2016-01-12_at_16.21.16.png) ### After "Rebase" button is clicked ![Screen_Shot_2016-01-12_at_16.24.39](/uploads/99619afd73df5850b5620734875add05/Screen_Shot_2016-01-12_at_16.24.39.png) ### When MR is viewed during rebasing ![Screen_Shot_2016-01-12_at_16.24.42](/uploads/80b6d314880c80530810e029988dd216/Screen_Shot_2016-01-12_at_16.24.42.png) ### With "Fast-forward merge", when ff merge is possible ![Screen_Shot_2016-01-12_at_16.19.26](/uploads/0b9e3b82ace27149c9c337b09d519396/Screen_Shot_2016-01-12_at_16.19.26.png) ### With "Merge commit" or "Merge commit with semi-linear history", when ff merge is possible ![Screen_Shot_2016-01-12_at_16.20.07](/uploads/30589140b304db55bc58c2c7ae9e1c90/Screen_Shot_2016-01-12_at_16.20.07.png) See merge request !110
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Marin Jankovski authored
Update to CE commit 777771 This ensures both CE and EE have the same code in the master branch for the RC release. See merge request !113
-
Yorick Peterse authored
-
Dmitriy Zaporozhets authored
merge request close message moved and merge request now refered by `!`. Fixes #4161 ![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png) See merge request !2387
-
Dmitriy Zaporozhets authored
Disable colorization if STDOUT is not a tty Closes #6118 See merge request !2403
-
Dmitriy Zaporozhets authored
Block the reported user before destroying the record This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117 See merge request !2402
-
Dmitriy Zaporozhets authored
Make sure time_ago_with_tooltip is using a Time object Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge. See merge request !2398
-
Dmitriy Zaporozhets authored
Comment and close button does not submit comment See merge request !2399
-
https://github.com/tbeadle/gitlabhqDmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Include the user_id in user_*_team system hooks.
-
Stan Hu authored
Mention channel/key bug in irkerd docs
-
Robert Speicher authored
It patches core classes (such as String) to add colorization methods like `red` which we can't disable the same way we can with the Colorization gem.
-
Robert Speicher authored
-
Robert Speicher authored
This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117
-
Jacob Schatz authored
-
Jacob Schatz authored
-
- 12 Jan, 2016 17 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
Prepare Installation and Update docs for 8.4 RC1 [ci skip] See merge request !2401
-
Robert Speicher authored
See merge request !107
-
Robert Speicher authored
[ci skip]
-
Robert Speicher authored
[ci skip]
-
Landon authored
Per this issue: https://gitlab.com/esr/irker/issues/2 A documentation update was added to irkerd (https://gitlab.com/esr/irker/commit/190808c37d4ab5f0f16fe35352ff36863c2732d5) but the bug is still there. Making a note of it here could save someone a lot of hassle. This could probably be worded better if someone else wants to take a stab at it.
-
Robert Speicher authored
-
Robert Speicher authored
Revert "Remove the `:coffee` and `:coffeescript` Haml filters" This reverts commit ae7de2f8. Several files in EE still use the `:coffeescript` filter and I don't have time to fix them before the CE-to-EE merge. See https://gitlab.com/gitlab-org/gitlab-ee/builds/553647 I will reintroduce this change in a future MR. See merge request !2400
-
Robert Speicher authored
[ci skip]
-
Robert Speicher authored
Also reformats paragraphs for a max width of 80 chars [ci skip]
-
Stan Hu authored
Closes #152
-
Drew Blessing authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Jacob Vosmaer authored
-
Jacob Vosmaer authored
-
Robert Speicher authored
This reverts commit ae7de2f8.
-