summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets2015-11-211-27/+22
|\
| * Reduce method complexity in AutocompleteControlleree-flogDouwe Maan2015-11-201-27/+22
* | Fix for Emojinotes_fix_stablenotes_fixValery Sizov2015-11-201-1/+1
* | Merge branch 'ci-yaml-validation' into 'master' Kamil Trzciński2015-11-191-2/+2
|\ \
| * | Don't rescue Exception, but StandardErrorci-yaml-validationKamil Trzcinski2015-11-191-2/+2
| |/
* | Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-193-3/+27
|\ \
| * | adressing commentsValery Sizov2015-11-191-6/+6
| * | satisfy rubocopValery Sizov2015-11-191-2/+2
| * | Emoji: fix image of emoji when it is submitted via commentValery Sizov2015-11-191-0/+1
| * | award for merge requests[ci skip]Valery Sizov2015-11-191-1/+1
| * | award emojiValery Sizov2015-11-193-3/+26
* | | Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' int...Robert Speicher2015-11-191-1/+8
|\ \ \
| * \ \ Merge branch 'master' into dbalexandre/gitlab-ce-fix-personal-snippet-access-...Douwe Maan2015-11-1720-91/+194
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-099-29/+93
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-032-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-021-1/+1
| |\ \ \ \ \ \
| * | | | | | | Use `read` rather than `show` like the ability nameDouglas Barbosa Alexandre2015-11-021-2/+2
| * | | | | | | Improve personal snippet access workflow. Fixes #3258Douglas Barbosa Alexandre2015-10-291-1/+8
* | | | | | | | Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master' Robert Speicher2015-11-193-38/+90
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | DRY up codedirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-181-30/+24
| * | | | | | | Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-187-64/+67
| |\ \ \ \ \ \ \
| * | | | | | | | Add "Start a new merge request" option to every commit formDouwe Maan2015-11-174-55/+69
| * | | | | | | | Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-1752-217/+417
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Add option to create merge request when editing/creating a fileDirceu Pereira Tiegs2015-10-192-2/+46
* | | | | | | | | Merge branch 'atom-feed-latest-update' into 'master' Yorick Peterse2015-11-191-18/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Refactor UsersController to not kill the databaseYorick Peterse2015-11-181-18/+11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Fix redirect after import fails.Douwe Maan2015-11-181-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'compare-first-commit' into 'master' Robert Speicher2015-11-171-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Correctly set comparison first commit when range includes a merge commitcompare-first-commitDouwe Maan2015-11-171-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-172-28/+36
|\ \ \ \ \ \ \
| * | | | | | | Use project member abilities more extensivelyDouwe Maan2015-11-172-28/+36
* | | | | | | | Merge branch 'remove-code-duplication'Dmitriy Zaporozhets2015-11-174-34/+29
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Refactor duplciate code for groups_controller.rb and slack_service/note_messa...Dmitriy Zaporozhets2015-11-174-34/+29
| |/ / / / / /
* | | | | | | Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-171-6/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-161-6/+1
* | | | | | | Fix removing avatar for groupDmitriy Zaporozhets2015-11-161-1/+1
* | | | | | | Group masters should be able to create/close milestonesDmitriy Zaporozhets2015-11-161-1/+1
* | | | | | | Fix a bug when milestone/label filter was empty for dashboard issues pageDmitriy Zaporozhets2015-11-161-0/+5
* | | | | | | Refactor global and group milestones logicDmitriy Zaporozhets2015-11-166-76/+53
* | | | | | | Create milestones in the groupDmitriy Zaporozhets2015-11-161-5/+31
|/ / / / / /
* | | | | | Add support for git lfs.lfsMarin Jankovski2015-11-161-3/+2
* | | | | | Merge branch 'fix_trailing_title_space' of https://gitlab.com/dblessing/gitla...Dmitriy Zaporozhets2015-11-162-2/+6
|\ \ \ \ \ \
| * | | | | | Fix trailing space issue with merge requests and issues. Fixes #2514Drew Blessing2015-11-102-2/+6
* | | | | | | Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-143-6/+38
|\ \ \ \ \ \ \
| * | | | | | | refactor login as to be impersonation with better login/logoutJames Newton2015-10-293-6/+38
* | | | | | | | Expose CI enable option in project featuresKamil Trzcinski2015-11-132-2/+3
* | | | | | | | Add ignore white space option in merge request diffMinsik Yoon2015-11-131-1/+2
* | | | | | | | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets2015-11-121-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid render edit_form in each notes.Jason Lee2015-11-121-1/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ci-deprecate-dumped-yaml' into 'master' Kamil Trzciński2015-11-121-4/+0
|\ \ \ \ \ \ \ \