summaryrefslogtreecommitdiff
Commit message (Expand)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
|\
| * 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
|\ \
| * | Don't automatically require awesome_printrs-disable-colorizationRobert Speicher2016-01-121-1/+1
| * | 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 recordrs-block-user-before-removalRobert Speicher2016-01-123-4/+23
| |/ /
* | | 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 objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-122-1/+5
* | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-136-22/+38
|\ \ \ \
| * | | | 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 closing/reopening...Jacob Schatz2016-01-122-4/+4
| * | | | 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 https://github.com/tbeadl...Dmitriy Zaporozhets2016-01-133-17/+26
|\ \ \ \ \ \
| * | | | | | 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.Tommy Beadle2016-01-062-2/+3
| |/ / / / / /
* | | | | | | Merge pull request #9968 from vimalloc/patch-1Stan Hu2016-01-121-3/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Mention channel/key bug in irkerd docsLandon2016-01-121-3/+4
* | | | | | | Merge branch 'rs-prepare-rc1' into 'master' Robert Speicher2016-01-122-2/+150
|\ \ \ \ \ \ \
| * | | | | | | Prepare Installation and Update docs for 8.4 RC1Robert Speicher2016-01-122-2/+150
|/ / / / / / /
* | | | | | | Merge branch 'rs-revert-remove-filters' into 'master' Robert Speicher2016-01-121-6/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Remove the `:coffee` and `:coffeescript` Haml filters"Robert Speicher2016-01-121-6/+0
|/ / / / / /
* | | | | | Merge branch 'change_milestone_close_copy' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
|\ \ \ \ \ \
| * | | | | | 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 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.4Jacob Vosmaer2016-01-121-0/+3
* | | | | | | | Merge branch 'gitlab-omnibus-really' into 'master' Robert Speicher2016-01-122-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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.4gitlab-workhorse-0.5.4Jacob Vosmaer2016-01-123-3/+3
| |/ / / / / /
View Lorry Controller Status