summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 8.4.0.rc1v8.4.0.rc1Marin Jankovski2016-01-131-1/+1
|
* Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-136-8/+19
|\ | | | | | | | | | | | | | | | | 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
| * changes `$quote-gray` to `$secondary-text`referenced-merge-requestsJacob Schatz2016-01-122-2/+2
| |
| * makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-123-5/+11
| |
| * merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-125-6/+11
| |
* | Merge branch 'rs-disable-colorization' into 'master' Dmitriy Zaporozhets2016-01-132-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Disable colorization if STDOUT is not a tty Closes #6118 See merge request !2403
| * | Don't automatically require awesome_printrs-disable-colorizationRobert Speicher2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | 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.
| * | Disable colorization if STDOUT is not a ttyRobert Speicher2016-01-121-0/+2
| | |
* | | Merge branch 'rs-block-user-before-removal' into 'master' Dmitriy Zaporozhets2016-01-133-4/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-123-4/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' Dmitriy Zaporozhets2016-01-132-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-122-1/+5
| | | | | | | | | | | | | | | | | | | | Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
* | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-136-22/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment and close button does not submit comment See merge request !2399
| * | | | gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-123-4/+24
| | | | |
| * | | | adds back in discussion.haml.html for issues commenting and ↵Jacob Schatz2016-01-122-4/+4
| | | | | | | | | | | | | | | | | | | | closing/reopening properly.
| * | | | removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-125-5/+17
| | | | |
| * | | | reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-125-124/+31
| | | | |
| * | | | reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-122-16/+2
| | | | |
| * | | | reverting _mr_title.html.hamlJacob Schatz2016-01-121-16/+10
| | | | |
| * | | | reverting merge_request_controllerJacob Schatz2016-01-121-9/+2
| | | | |
| * | | | restores merge request coffee fileJacob Schatz2016-01-121-49/+0
| | | | |
| * | | | reverting _disscusionJacob Schatz2016-01-121-4/+5
| | | | |
| * | | | fixes conflictsJacob Schatz2016-01-11422-2997/+4659
| |\ \ \ \
| * | | | | initial json requests instead of HTMLJacob Schatz2016-01-0710-39/+66
| | | | | |
| * | | | | adds tests (and passes them) for ajax open and close merge requests.Jacob Schatz2016-01-063-2/+100
| | | | | |
| * | | | | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-055-25/+67
| | | | | |
| * | | | | removes commented out code.Jacob Schatz2015-12-301-2/+0
| | | | | |
| * | | | | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.Jacob Schatz2015-12-293-19/+15
| | | | | |
* | | | | | Merge branch 'add_username_to_user_system_hooks' of ↵Dmitriy Zaporozhets2016-01-133-17/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tbeadle/gitlabhq Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Include user_username in user_(add_to/remove_from)_(project/group) system hooks.Tommy Beadle2016-01-073-4/+10
| | | | | | |
| * | | | | | Include the username in user_create/destroy system hooks.Tommy Beadle2016-01-073-3/+6
| | | | | | |
* | | | | | | Merge pull request #9952 from tbeadle/user_id_in_member_system_hookDmitriy Zaporozhets2016-01-132-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Include the user_id in user_*_team system hooks.
| * | | | | | | Include the user_id in user_*_team system hooks.Tommy Beadle2016-01-062-2/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the user_id is not included in the data for user_add_to_team and user_remove_from_team system hooks. The documentation already states that the user_id should be included.
* | | | | | | Merge pull request #9968 from vimalloc/patch-1Stan Hu2016-01-121-3/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Mention channel/key bug in irkerd docs
| * | | | | | Mention channel/key bug in irkerd docsLandon2016-01-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'rs-prepare-rc1' into 'master' Robert Speicher2016-01-122-2/+150
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare Installation and Update docs for 8.4 RC1 [ci skip] See merge request !2401
| * | | | | | | Prepare Installation and Update docs for 8.4 RC1Robert Speicher2016-01-122-2/+150
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'rs-revert-remove-filters' into 'master' Robert Speicher2016-01-121-6/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove the `:coffee` and `:coffeescript` Haml filters" This reverts commit ae7de2f8510d6d4b69120f168122e26d69dda256. 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
| * | | | | | Revert "Remove the `:coffee` and `:coffeescript` Haml filters"Robert Speicher2016-01-121-6/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | This reverts commit ae7de2f8510d6d4b69120f168122e26d69dda256.
* | | | | | Merge branch 'change_milestone_close_copy' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change milestone close notice copy. Closes #6051 See merge request !2372
| * | | | | | Revert group milestone copychange_milestone_close_copyJosh Frye2016-01-121-1/+1
| | | | | | |
| * | | | | | Change milestone close notice copy. Closes #6051Josh Frye2016-01-112-2/+2
| | | | | | |
* | | | | | | Merge branch 'improve_more_buttons' into 'master' Jacob Schatz2016-01-123-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve admin area button style A lot of the buttons in the top right in the admin area were too big. This makes those the new `btn-nr` size which seems to look nice. ## User buttons ### Current ![Screen_Shot_2016-01-08_at_2.29.30_PM](/uploads/8920d4a67ff4a20617e5b4d319ba154e/Screen_Shot_2016-01-08_at_2.29.30_PM.png) ### New ![Screen_Shot_2016-01-08_at_2.29.21_PM](/uploads/494741f6e92592ff2c60683f399bb1c1/Screen_Shot_2016-01-08_at_2.29.21_PM.png) ## Project edit button ### Current ![Screen_Shot_2016-01-08_at_2.29.59_PM](/uploads/09a2f8fddc45120510dd10758ce33c51/Screen_Shot_2016-01-08_at_2.29.59_PM.png) ### New ![Screen_Shot_2016-01-08_at_2.30.14_PM](/uploads/93a72a7c42b1974643b1e9ffd3ec8511/Screen_Shot_2016-01-08_at_2.30.14_PM.png) ## Label button ### Current ![Screen_Shot_2016-01-08_at_2.38.09_PM](/uploads/9cff790e1a4e2d650487c9765d0235a4/Screen_Shot_2016-01-08_at_2.38.09_PM.png) ### New ![Screen_Shot_2016-01-08_at_2.38.31_PM](/uploads/9462ff2393249eb762dc7cb92605c733/Screen_Shot_2016-01-08_at_2.38.31_PM.png) cc/ @jschatz1 @creamzy @skyruler See merge request !2351
| * | | | | | Improve admin area button styleDrew Blessing2016-01-113-4/+4
| | | | | | |
* | | | | | | Merge branch 'changelog-8.3.4' into 'master' Robert Speicher2016-01-121-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entry for 8.3.4 [ci skip] See merge request !2393
| * | | | | | | Add CHANGELOG entry for 8.3.4Jacob Vosmaer2016-01-121-0/+3
| | | | | | | |
* | | | | | | | Merge branch 'gitlab-omnibus-really' into 'master' Robert Speicher2016-01-122-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Never heard of gitlab-omnibus See merge request !2388
| * | | | | | | Never heard of gitlab-omnibusgitlab-omnibus-reallyJacob Vosmaer2016-01-122-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'gitlab-workhorse-0.5.4' into 'master' Jacob Vosmaer2016-01-123-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.5.4 Fixes routing errors for /api/v3/projects/ See merge request !2391
| * | | | | | | Use gitlab-workhorse 0.5.4gitlab-workhorse-0.5.4Jacob Vosmaer2016-01-123-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes routing errors for /api/v3/projects/
View Lorry Controller Status