summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix spec/controllers/projects/commits_controller_spec.rbrails5-middleValery Sizov2017-09-201-5/+8
* [rails 5][ci skip] Fix spec/finders/issues_finder_spec.rbValery Sizov2017-09-121-6/+0
* [rails 5] Revert rails-controller-testing backValery Sizov2017-09-112-0/+6
* [rails 5][ci skip] Fix enum functionality for CommitStatus.failure_reason fieldValery Sizov2017-09-111-0/+8
* [rails 5] Fix for spec/helpers/storage_helper_spec.rbValery Sizov2017-09-081-1/+1
* [rails 5] Fix for lib/gitlab/contributions_calendar.rbValery Sizov2017-09-081-1/+1
* [rails 5] Remove monkey patch active_record_array_type_casting.rbValery Sizov2017-09-081-20/+0
* [rails 5] Resolve Gemfile after pulling a fresh masterValery Sizov2017-09-088-125/+6
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into rails5Valery Sizov2017-09-082150-19362/+56049
|\
| * Merge branch 'rs-pick-security-into-master' into 'master'Douwe Maan2017-09-0823-161/+307
| |\
| | * Remove changelogs we've already released in the security patchesrs-pick-security-into-masterRobert Speicher2017-09-075-21/+0
| | * Merge branch 'update-pages-9-5' into 'security-9-5'Douwe Maan2017-09-071-1/+1
| | * Merge branch 'fix-user-select-dropdown-escaping' into 'security-9-5'Clement Ho2017-09-071-6/+6
| | * Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-078-8/+23
| | * Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-073-4/+42
| | * Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-079-124/+161
| | * Merge branch 'fix-escape-commit-block' into 'security-9-5'Douwe Maan2017-09-073-3/+30
| | * Merge branch 'fix-comment-reflection' into 'security-9-5'Jacob Schatz2017-09-072-4/+21
| | * Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-073-11/+44
| * | Merge branch '37550-improve-clarity-of-helm-chart-docs' into 'master'Achilleas Pipinellis2017-09-084-39/+54
| |\ \ | | |/ | |/|
| | * Improve clarity of Helm Chart docsJoshua Lambert2017-09-084-39/+54
| |/
| * Merge remote-tracking branch 'dev/master'Robert Speicher2017-09-072-5/+40
| |\
| | * Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2017-09-06321-2793/+6549
| | |\
| | * | Update CHANGELOG.md for 9.5.4Jose Ivan Vargas2017-09-061-0/+10
| | * | Update CHANGELOG.md for 9.4.6Jose Ivan Vargas2017-09-061-0/+12
| | * | Update CHANGELOG.md for 9.3.11Jose Ivan Vargas2017-09-062-5/+18
| * | | Merge branch 'jk-update-schema' into 'master'rd-testYorick Peterse2017-09-071-1/+1
| |\ \ \
| | * | | Update db schema to correspond with migrationsjk-update-schemaJarka Kadlecova2017-09-071-1/+1
| * | | | Merge branch '36638-select-project-to-create-issue-button-is-disconnected-fro...Clement Ho2017-09-073-6/+24
| |\ \ \ \
| | * | | | Normalize styles for empty-state group-level new issue/MR combo buttonBryce Johnson2017-09-073-6/+24
| |/ / / /
| * | | | Merge branch '30473-allow-creation-of-subgroups-with-gitlab_default_can_creat...Douwe Maan2017-09-079-31/+235
| |\ \ \ \
| | * | | | Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-079-31/+235
| * | | | | Merge branch 'docs/autodevops' into 'master'Kamil Trzciński2017-09-0711-10/+455
| |\ \ \ \ \
| | * | | | | Add Auto DevOps docsAchilleas Pipinellis2017-09-0711-10/+455
| |/ / / / /
| * | | | | Merge branch 'zj-update-rails-template' into 'master'Kamil Trzciński2017-09-072-0/+5
| |\ \ \ \ \
| | * | | | | Update rails template to include postgreszj-update-rails-templateZeger-Jan van de Weg2017-09-072-0/+5
| * | | | | | Merge branch '35558-only-one-garbage-collection-should-be-running-per-project...Douwe Maan2017-09-075-24/+154
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-075-24/+154
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'rs-trigger-build-docs-offenses' into 'master'Rémy Coutable2017-09-071-6/+6
| |\ \ \ \ \
| | * | | | | Resolve RuboCop violations in scripts/trigger-build-docsRobert Speicher2017-09-071-6/+6
| * | | | | | Merge branch 'winh-filter-dropdowns-keyboard-selection' into 'master'Clement Ho2017-09-071-0/+11
| |\ \ \ \ \ \
| | * | | | | | Restore droplab item style for keyboard navigationwinh-filter-dropdowns-keyboard-selectionwinh2017-09-061-0/+11
| * | | | | | | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan2017-09-0720-134/+861
| |\ \ \ \ \ \ \
| | * | | | | | | Optimize policy ruleMichael Kozono2017-09-071-2/+3
| | * | | | | | | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroupsMichael Kozono2017-09-0610-70/+70
| | * | | | | | | Update “Share with group lock” docsMichael Kozono2017-09-063-17/+24
| | * | | | | | | Make UpdateService error message translatableWinnie Hellmann2017-09-061-1/+1
| | * | | | | | | Replace <h5> with <label>Winnie Hellmann2017-09-062-3/+1
| | * | | | | | | Add missing .html_safesWinnie Hellmann2017-09-061-3/+3
| | * | | | | | | Remove top margin from .control-labelWinnie Hellmann2017-09-061-0/+2
View Lorry Controller Status