summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dashboard-filter-search-keep-params' into 'master' Dmitriy Zaporozhets2017-03-043-2/+11
|\
| * Refactor projects filtering by nameDmitriy Zaporozhets2017-03-031-0/+9
| * Fixed filter_projects param still used in group controllerPhil Hughes2017-03-031-1/+1
| * Fixes filtering by name reseting archive filterPhil Hughes2017-03-031-1/+1
* | Bump health_check gem to version 2.6.0bump-health-check-gemDouglas Barbosa Alexandre2017-03-031-1/+1
* | Merge branch 'dm-fix-cherry-pick' into 'master' Robert Speicher2017-03-033-48/+47
|\ \
| * | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-023-48/+47
* | | Stop setting Strict-Transport-Securty header from within the appPaweł Chojnacki2017-03-031-4/+0
| |/ |/|
* | Merge branch '28010-mr-merge-button-default-to-danger' into 'master' Alfredo Sumaran2017-03-031-1/+4
|\ \ | |/ |/|
| * Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
* | Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master' Robert Speicher2017-03-021-6/+1
|\ \
| * | Fix creating a file in an empty repo using the APIDouwe Maan2017-03-011-6/+1
* | | Cleaning up navigational order - ProjectKushal Pandya2017-03-022-12/+30
* | | Merge branch 'dz-dashboard-groups-search' into 'master' Dmitriy Zaporozhets2017-03-022-2/+23
|\ \ \
| * | | Add filter and sorting to dashboard groups pageDmitriy Zaporozhets2017-03-012-2/+23
* | | | Merge branch 'fix/gb/remove-deprecated-ci-build-status-badge' into 'master'Rémy Coutable2017-03-021-47/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove deprecated legacy CI project status badgeGrzegorz Bizon2017-03-011-47/+0
* | | | Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-012-13/+13
|\ \ \ \
| * | | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-012-13/+13
| | |/ / | |/| |
* | | | Merge branch 'fix/gb/improve-merge-request-pipelines-api' into 'master' Kamil Trzciński2017-03-011-1/+3
|\ \ \ \
| * | | | Fix rubocop errorfix/gb/improve-merge-request-pipelines-apiFilipa Lacerda2017-02-281-1/+2
| * | | | Reinstate new merge request pipelines hash in APIGrzegorz Bizon2017-02-281-2/+3
| |/ / /
* | | | Merge branch '28609-fix-redirect-to-home-page-url' into 'master' Robert Speicher2017-03-012-31/+27
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix the redirect to custom home page URL and move it to RootController28609-fix-redirect-to-home-page-urlRémy Coutable2017-02-272-31/+27
* | | | Merge branch 'custom-empty-exception-class-cop' into 'master' Robert Speicher2017-03-011-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-011-1/+1
| | |/ | |/|
* | | Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-011-9/+2
|\ \ \ | |/ / |/| |
| * | add /award slash commandmhasbini2017-02-281-9/+2
* | | Merge branch 'mock-ci-service' into 'master'Douwe Maan2017-02-271-0/+1
|\ \ \
| * | | Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-241-0/+1
| | |/ | |/|
* | | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-273-14/+29
|\ \ \ | |/ / |/| |
| * | Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-243-14/+29
* | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-2426-120/+181
|\ \ \ | | |/ | |/|
| * | Merge branch 'create_branch_repo_less' into 'master' Robert Speicher2017-02-231-4/+26
| |\ \
| | * | Fixes after reviewcreate_branch_repo_lessValery Sizov2017-02-231-5/+15
| | * | Create master branch first if project is repository-lessValery Sizov2017-02-231-4/+16
| * | | Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-231-4/+4
| * | | Revert "Enable Style/DotPosition"Douwe Maan2017-02-2313-65/+65
| * | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2331-120/+120
| * | | Fix new offensesDouwe Maan2017-02-231-1/+1
| * | | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-232-3/+6
| * | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-2331-122/+122
| * | | Fix code for copsDouwe Maan2017-02-234-25/+29
| * | | Enable Style/ConditionalAssignmentDouwe Maan2017-02-234-12/+12
| * | | Enable Style/ColonMethodCallDouwe Maan2017-02-231-1/+1
| * | | Enable Performance/RedundantBlockCallDouwe Maan2017-02-231-1/+1
| * | | Enable Style/MutableConstantDouwe Maan2017-02-233-5/+5
| * | | Enable Style/DotPositionDouwe Maan2017-02-2313-69/+69
| * | | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-2326-124/+154
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-225-10/+18
| | |\ \ | | | |/ | | |/|
View Lorry Controller Status