summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure that `Group#members_with_parents` only includes real users35444-error-500-viewing-notes-with-anonymous-userSean McGivern2017-07-242-1/+9
* Don't treat anonymous users as owners when group has pending invitesSean McGivern2017-07-244-5/+30
* Merge branch 'compress-nav-logo' into 'master'Phil Hughes2017-07-241-1/+1
|\
| * Compress gitlab svg logocompress-nav-logoClement Ho2017-07-211-1/+1
* | Merge branch '34316-edit-issues-sidebar-needs-some-ui-polish' into 'master'Phil Hughes2017-07-245-11/+28
|\ \
| * | Bulk update sidebar UI polishBryce Johnson2017-07-245-11/+28
|/ /
* | Merge branch '35399-mini-graph-commits-box' into 'master'Phil Hughes2017-07-242-1/+9
|\ \
| * | Fix margin in mini graph for commits boxFilipa Lacerda2017-07-242-1/+9
|/ /
* | Merge branch '35412-language-space' into 'master'Phil Hughes2017-07-241-3/+3
|\ \
| * | Add space between words in language dropdownFilipa Lacerda2017-07-241-3/+3
|/ /
* | Merge branch '35330-fix-nginx-add-haproxy' into 'master'Tim Zallmann2017-07-244-2/+44
|\ \
| * | Update nginx docs35330-fix-nginx-add-haproxyJoshua Lambert2017-07-211-1/+1
| * | Fix for HA ProxyJoshua Lambert2017-07-201-1/+1
| * | Add HA Proxy metrics, fix NGINXJoshua Lambert2017-07-203-1/+43
* | | Merge branch 'fix-old-ci-api' into 'master'Grzegorz Bizon2017-07-222-1/+67
|\ \ \
| * | | Fix support for old CI API when image or services are not specifiedfix-old-ci-apiKamil Trzcinski2017-07-222-1/+67
* | | | Merge branch 'short-circuit-coverage-with-empty-regex' into 'master'Grzegorz Bizon2017-07-224-5/+32
|\ \ \ \
| * | | | Short-circuit build coverage extraction for empty regexesNick Thomas2017-07-224-5/+32
|/ / / /
* | | | Update VERSION to 9.5.0-prev9.5.0.preJames Edwards-Jones2017-07-221-1/+1
* | | | Update CHANGELOG.md for 9.4.0James Edwards-Jones2017-07-22179-723/+187
* | | | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-2215-114/+159
|\ \ \ \
| * | | | Port spinach tests to rspec feature specszj-pipeline-badge-improvementsZ.J. van de Weg2017-07-213-64/+61
| * | | | Reword success to passing for pipeline badgesZ.J. van de Weg2017-07-215-3/+22
| * | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-2112-54/+83
* | | | | Merge branch '35368-fix-gcovr-regexp-matching' into 'master'Grzegorz Bizon2017-07-222-0/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix the gcovr coverage regex by removing line separators before scanningNick Thomas2017-07-212-0/+8
* | | | | Merge branch '35178-remember-me-in-omniauth-box-seems-too-close-to-icons' int...Clement Ho2017-07-212-3/+3
|\ \ \ \ \
| * | | | | add padding above Remember Me for social login35178-remember-me-in-omniauth-box-seems-too-close-to-iconsSimon Knox2017-07-202-3/+3
* | | | | | Merge branch 'dz-sidekiq-remove-queue' into 'master'Sean McGivern2017-07-211-0/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Capitalize Sidekiq word in dev docDmitriy Zaporozhets2017-07-211-1/+1
| * | | | | Update sidekiq_style_guide.md with removing or renaming queues instructionsdz-sidekiq-remove-queueDmitriy Zaporozhets2017-07-211-0/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'harishsr-fix-typo-in-ldap-docs' into 'master'Drew Blessing2017-07-211-1/+1
|\ \ \ \ \
| * | | | | Fix typo in the LDAP docs missing a required colonHarish Ramachandran2017-07-191-1/+1
* | | | | | Merge branch '35236-svg-logo' into 'master'Phil Hughes2017-07-213-4/+17
|\ \ \ \ \ \
| * | | | | | Use custom font SVG for logoAnnabel Dunstone Gray2017-07-213-4/+17
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '35367-speedup-lint-javascript-report-job' into 'master'Kamil Trzciński2017-07-211-0/+2
|\ \ \ \ \ \
| * | | | | | Make the lint:javascript:report job depends on setup-test-env only35367-speedup-lint-javascript-report-jobRémy Coutable2017-07-201-0/+2
* | | | | | | Merge branch 'breadcrumbs-px-height' into 'master'Phil Hughes2017-07-211-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add 1px to breadcrumbs min heightAnnabel Dunstone Gray2017-07-211-1/+1
* | | | | | | Merge branch 'gitaly-tree-entries' into 'master'Rémy Coutable2017-07-215-33/+108
|\ \ \ \ \ \ \
| * | | | | | | Incorporate CommitService.GetTreeEntries Gitaly callgitaly-tree-entriesAlejandro Rodríguez2017-07-205-33/+108
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '34549-extract-devise-mappings-into-helper' into 'master'Rémy Coutable2017-07-216-6/+32
|\ \ \ \ \ \ \
| * | | | | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test h...Jacopo2017-07-206-6/+32
* | | | | | | | Merge branch 'rs-move-mr-slash-command-spec-from-issues' into 'master'Rémy Coutable2017-07-212-26/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Move a spec related to merge requests out of a feature related to issuesrs-move-mr-slash-command-spec-from-issuesRobert Speicher2017-07-202-26/+18
* | | | | | | | | Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'Robert Speicher2017-07-216-64/+130
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Migrate Gitlab::Git::Commit.find_all to Gitalyfeature/migrate-commit-find-all-to-gitalyAhmad Sherif2017-07-206-64/+130
* | | | | | | | | Merge branch 'improve-ee-compat-check' into 'master'Robert Speicher2017-07-211-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Developer can just download the patch from the `ee_compat_check` job's artifactimprove-ee-compat-checkRémy Coutable2017-07-191-6/+7
* | | | | | | | | | Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' int...Robert Speicher2017-07-213-3/+3
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status