summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-2317-83/+83
* Fix code for copsDouwe Maan2017-02-232-13/+15
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-232-6/+6
* Enable Style/DotPositionDouwe Maan2017-02-237-54/+54
* Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-237-59/+40
|\
| * Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-222-2/+2
| |\
| | * Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-214-16/+7
| | |\
| | * | Add merge request count to each issue on issues listblackst0ne2017-02-172-2/+2
| * | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-222-38/+17
| |\ \ \
| | * | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-212-38/+17
| | | |/ | | |/|
| * | | Merge branch 'add-filtered-search-to-mr' into 'master' Alfredo Sumaran2017-02-221-0/+11
| |\ \ \
| | * | | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-211-0/+11
| | |/ /
| * | | No more and/orDouwe Maan2017-02-212-3/+3
| |/ /
| * | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-201-12/+1
| |\ \
| | * | Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-201-12/+1
| * | | Merge branch '27920-both-wip-messages-showing' into 'master' Fatih Acet2017-02-172-1/+3
| |\ \ \
| | * | | Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-142-1/+3
| * | | | Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-171-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-1516-62/+141
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-074-4/+75
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-0413-36/+95
| | |\ \ \ \ \
| | * | | | | | Prefer service object over after_save hookLin Jen-Shin2017-01-211-3/+3
* | | | | | | | Adds Pending and Finished tabs to pipelines pageFilipa Lacerda2017-02-161-2/+10
|/ / / / / / /
* | | | | | | Merge branch 'paginate-environments-bundle' into 'master' Fatih Acet2017-02-161-5/+30
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundleFilipa Lacerda2017-02-161-5/+30
| |\ \ \ \ \ \ \
| | * | | | | | | Add count keys to response JSONfe-paginated-environments-apiZ.J. van de Weg2017-02-151-3/+4
| | * | | | | | | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-122-4/+8
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add route for environment folder and expose an APIGrzegorz Bizon2017-02-091-0/+18
| | * | | | | | | | Resolve 500 errorFilipa Lacerda2017-02-091-1/+0
| | * | | | | | | | Add support for environment scopes in controllerGrzegorz Bizon2017-02-091-7/+12
| | * | | | | | | | Enable grouping and pagination in environmnets APIGrzegorz Bizon2017-02-091-1/+3
* | | | | | | | | | Merge branch '28176_merge_widget_fix' into 'master' Sean McGivern2017-02-161-3/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-161-3/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'move_tags_service_to_namespace' into 'master'Rémy Coutable2017-02-151-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Move tag services to `Tags` namespacedixpac2017-02-141-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Execute web hooks for WikiPage delete operationMark Fletcher2017-02-141-1/+1
|/ / / / / / /
* | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-131-1/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-2919-160/+184
| |\ \ \ \ \ \ \
| * | | | | | | | Render wiki entries using a collection of WikiPage and WikiDirectory objectsAlex Braha Stoll2016-12-311-2/+2
| * | | | | | | | Show directory hierarchy when listing wiki pagesAlex Braha Stoll2016-12-311-1/+2
* | | | | | | | | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-132-4/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-092-4/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-071-1/+1
* | | | | | | | | | Merge branch 'rename_files_delete_service' into 'master' Rémy Coutable2017-02-131-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-101-4/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-101-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' Jacob Schatz2017-02-101-2/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titlesPhil Hughes2017-01-261-2/+6
* | | | | | | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-081-1/+1
|\ \ \ \ \ \ \ \