summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2sh-bump-omniauth-gitlabStan Hu2016-11-073-3/+7
* Merge branch 'change-docs-trigger-id' into 'master' Achilleas Pipinellis2016-11-071-1/+1
|\
| * Replace trigger with the new ID of the docs projectAchilleas Pipinellis2016-11-071-1/+1
* | Merge branch '17492-link-contrast' into 'master' Annabel Dunstone Gray2016-11-074-16/+16
|\ \ | |/ |/|
| * 17492 Update link color for more accessible contrast17492-link-contrasttauriedavis2016-11-074-16/+16
|/
* Merge branch '23036-replace-git-blame-spinach-tests-with-rspec-feature-tests'...Rémy Coutable2016-11-074-29/+25
|\
| * Rewritten spinach git_blame tests to rspec feature testsLisanne Fellinger2016-11-074-29/+25
* | Merge branch '21664-incorrect-workhorse-version-number-displayed' into 'master' Rémy Coutable2016-11-074-1/+35
|\ \
| * | Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-074-1/+35
* | | Merge branch 'cs-upgrade-redis-actionpack' into 'master' Rémy Coutable2016-11-072-17/+17
|\ \ \
| * | | Upgrade redis-rails from 4.0.0 to 5.0.1.cs-upgrade-redis-actionpackConnor Shea2016-11-042-17/+17
* | | | Merge branch 'add-api-label-id' into 'master' Sean McGivern2016-11-074-90/+111
|\ \ \ \
| * | | | Expose Label id to APIRares Sfirlogea2016-11-074-90/+111
* | | | | Merge branch 'process-commits-using-sidekiq' into 'master' Robert Speicher2016-11-0719-59/+565
|\ \ \ \ \
| * | | | | Process commits in a separate workerprocess-commits-using-sidekiqYorick Peterse2016-11-0711-51/+251
| * | | | | Added IssueCollectionYorick Peterse2016-11-076-8/+127
| * | | | | Flush Housekeeping data from Redis specsYorick Peterse2016-11-071-0/+7
| * | | | | Add the method ExternalIssue#project_idYorick Peterse2016-11-072-1/+16
| * | | | | Add User#projects_with_reporter_access_limited_toYorick Peterse2016-11-072-0/+46
| * | | | | Added tests for IssuePolicyYorick Peterse2016-11-071-0/+119
* | | | | | Merge branch 'missing-raw-snippet-access-spec' into 'master' Sean McGivern2016-11-073-59/+151
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add missing security specs for raw snippet accessthe-undefined2016-11-053-59/+151
* | | | | | Merge branch '23034-speed-up-testenv-set-repo-refs' into 'master' Yorick Peterse2016-11-071-13/+11
|\ \ \ \ \ \
| * | | | | | Use `git update-ref --stdin -z` to speed up TestEnv.set_repo_refsNick Thomas2016-11-071-13/+11
* | | | | | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-0716-82/+408
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unused 'require'Jacob Vosmaer2016-11-041-1/+0
| * | | | | | Refine Git garbage collectionJacob Vosmaer2016-11-0416-82/+409
* | | | | | | Merge branch '24059-post-facto-fixups' into 'master' Douwe Maan2016-11-073-7/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Simplify ApplicationSetting#repository_storagesNick Thomas2016-11-071-5/+1
| * | | | | | Renaming columns requires downtimeNick Thomas2016-11-072-2/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'add-project-import-data-index' into 'master' Yorick Peterse2016-11-073-1/+19
|\ \ \ \ \ \
| * | | | | | Add an index for project_id in project_import_data to improveadd-project-import-data-indexStan Hu2016-11-063-1/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'refactor-issuable-form-template_selector' into 'master' Robert Speicher2016-11-074-44/+68
|\ \ \ \ \ \
| * | | | | | Refactor template selector in issuable formrefactor-issuable-form-template_selectorRémy Coutable2016-11-044-44/+68
* | | | | | | Merge branch 'use_helper_method' into 'master' Rémy Coutable2016-11-072-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Use method helper instead of add_template_helperbogdanvlviv2016-11-062-8/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'api-priority-labels' into 'master' Rémy Coutable2016-11-075-29/+151
|\ \ \ \ \ \ \
| * | | | | | | Update label's API documentationRobert Schilling2016-11-071-10/+34
| * | | | | | | Ability to update labels priority via APIRobert Schilling2016-11-074-19/+117
| |/ / / / / /
* | | | | | | Merge branch 'broken-link-frontend-dev-guide' into 'master' Rémy Coutable2016-11-072-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix broken link to observatory cli on Frontend Dev GuideSam Rose2016-11-062-1/+5
|/ / / / / /
* | | | | | Merge branch 'remove-diff-comments-spec-logging' into 'master' Fatih Acet2016-11-051-1/+0
|\ \ \ \ \ \
| * | | | | | Remove logging to console in diff_comments_store_specwinniehell2016-11-051-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'split-out-markdown-cache-update' into 'master' Yorick Peterse2016-11-051-1/+5
|\ \ \ \ \ \
| * | | | | | Split out markdown cache storage into a separate methodNick Thomas2016-11-041-1/+5
* | | | | | | Merge branch 'correct-spelling-andreesen' into 'master' Robert Speicher2016-11-051-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Correct spelling of Andreesen's namecorrect-spelling-andreesenVictor Wu2016-11-041-1/+1
* | | | | | | Merge branch 'move-public-snippets-feature-to-rspec' into 'master' Robert Speicher2016-11-053-35/+19
|\ \ \ \ \ \ \
| * | | | | | | Move spinach public snippet feature to rspec specthe-undefined2016-11-043-35/+19
* | | | | | | | Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-0411-15/+15
|\ \ \ \ \ \ \ \
View Lorry Controller Status