summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a spec and actually display the flash noticesandish/gitlab-ce-update_ret_valRémy Coutable2017-01-165-114/+80
* Fix to display notice when project settings updated.sandish chen2017-01-154-3/+8
* Merge branch 'bug/project-feature-compatibility' into 'master' Douwe Maan2017-01-142-1/+6
|\
| * Mutate the attribute instead of issuing a write operation to the DBbug/project-feature-compatibilityGabriel Mazetto2017-01-122-1/+6
* | Merge branch '25018-gitlab-checks-changeaccess-looks-for-user-permissions-tha...Douwe Maan2017-01-142-5/+2
|\ \
| * | Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-122-5/+2
* | | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-143-4/+26
|\ \ \
| * | | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-123-4/+26
* | | | Merge branch 'fix-build-sort-order' into 'master' Robert Speicher2017-01-134-1/+30
|\ \ \ \
| * | | | revise sortable_name test formattingMike Greiling2017-01-131-4/+1
| * | | | prefer unit test on model over view testfix-build-sort-orderMike Greiling2017-01-022-35/+22
| * | | | rename sort methodMike Greiling2017-01-022-2/+2
| * | | | add CHANGELOG.md entry for !8277Mike Greiling2017-01-021-0/+4
| * | | | add tests for natural sorting of build namesMike Greiling2017-01-021-0/+35
| * | | | add natural sorting token for build namesMike Greiling2017-01-022-1/+7
* | | | | Merge branch 'fix-single-team-specs' into 'master' Robert Speicher2017-01-132-8/+88
|\ \ \ \ \
| * | | | | Improve disabled state selectfix-single-team-specsLuke "Jared" Bennett2017-01-132-8/+88
* | | | | | Merge branch 'fix/merge-separate-build-spec-files' into 'master' Robert Speicher2017-01-132-1341/+1275
|\ \ \ \ \ \
| * | | | | | Fix Rubocop offense in build specsfix/merge-separate-build-spec-filesGrzegorz Bizon2017-01-131-1/+0
| * | | | | | Remove empty build spec file from invalid locationGrzegorz Bizon2017-01-131-6/+0
| * | | | | | Merge build specs into file that has valid locationGrzegorz Bizon2017-01-132-1335/+1276
* | | | | | | Merge branch 'fix/serialized-commit-path' into 'master' Rémy Coutable2017-01-133-4/+10
|\ \ \ \ \ \ \
| * | | | | | | Add Changelog for commit links fix on pipelines pagefix/serialized-commit-pathGrzegorz Bizon2017-01-131-0/+4
| * | | | | | | Update commit entity to point to valid commit pageGrzegorz Bizon2017-01-132-4/+6
| |/ / / / / /
* | | | | | | Merge branch 'zj-fix-broken-link-docs' into 'master' Robert Speicher2017-01-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix broken link in docszj-fix-broken-link-docsZ.J. van de Weg2017-01-111-1/+1
* | | | | | | | Merge branch 'env-var-in-redis-config' into 'master' Rémy Coutable2017-01-135-2/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow to use ENV variables in redis configSemyon Pupkov2017-01-135-2/+28
* | | | | | | | | Merge branch 'milestone-issuable-labels-spacing' into 'master' Annabel Dunstone Gray2017-01-131-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fixed spacing of labels in issuable row on milestone#showPhil Hughes2017-01-131-0/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-ruby21-milestone-api-specs' into 'master' Sean McGivern2017-01-131-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Put .gitlab-ci.yml back to only 2.1 on masterSean McGivern2017-01-131-0/+5
| * | | | | | | | Only escape the 'No Milestone' paramfix-ruby21-milestone-api-specs-2Sean McGivern2017-01-132-4/+6
| * | | | | | | | Fix milestone API specs in Ruby 2.1fix-ruby21-milestone-api-specsSean McGivern2017-01-132-6/+1
* | | | | | | | | Merge branch 'fix/git-migration' into 'master' Sean McGivern2017-01-131-4/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add check for new path existenceJames Lopez2017-01-131-4/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'clipboard-button-text' into 'master' Sean McGivern2017-01-135-7/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Text for copy to clipboard: URL, personal access token, commands, referenceclipboard-button-textvictorwu2017-01-125-7/+10
* | | | | | | | | Merge branch '23194-fix-no-milestone-option-for-projects-endpoint' into 'mast...Sean McGivern2017-01-134-24/+112
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | API: Implement project issues iid param with IssuesFinder and add tests23194-fix-no-milestone-option-for-projects-endpointDavid Eisner2017-01-124-24/+110
| * | | | | | | | Adding 'IssueFinder' for 'projects' API endpointPanagiotis Atmatzidis2017-01-121-6/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '26627-update-gitlab-markup-to-1-5-1-again' into 'master' Robert Speicher2017-01-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-againRémy Coutable2017-01-121-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'move-dashboard-help-spinach-to-rspec' into 'master' Rémy Coutable2017-01-133-30/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Move dashboard help spinach test to rspecSemyon Pupkov2017-01-043-30/+17
* | | | | | | | | Merge branch 'move-dashboard-group-spinach-to-rspec' into 'master' Rémy Coutable2017-01-133-38/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move dashboard group spinach test to rspecSemyon Pupkov2017-01-043-38/+20
| |/ / / / / / / /
* | | | | | | | | Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master' Rémy Coutable2017-01-134-43/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move dashboard archived projects spinach tests to rspecSemyon Pupkov2017-01-044-43/+32
| |/ / / / / / / /
* | | | | | | | | Merge branch 'move-dashboard-activetab-spinach-to-rspec' into 'master' Rémy Coutable2017-01-133-29/+46
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status