summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unused form for admin application settingsdz-improve-app-settings-6Dmitriy Zaporozhets2018-04-042-8/+0
* Move the rest of application settings to expandable blocksDmitriy Zaporozhets2018-04-0412-171/+319
* Move network related app settings to expandable blocksDmitriy Zaporozhets2018-04-044-60/+88
* Merge branch 'dz-improve-app-settings-4' into 'master'Grzegorz Bizon2018-04-0416-202/+297
|\
| * Remove unnecessary section looking in admin settings qaDmitriy Zaporozhets2018-04-031-12/+2
| * Explicitly use page context for qa/factory/settings/hashed_storage.rbDmitriy Zaporozhets2018-04-031-2/+2
| * Move repository, storage, abuse settings and logging settings to expandable s...Dmitriy Zaporozhets2018-04-0216-202/+307
* | Merge branch '5547-backport-gitlab-git-checksum-to-ce' into 'master'Stan Hu2018-04-032-0/+120
|\ \
| * | Backport Gitlab::Git::Checksum to CEDouglas Barbosa Alexandre2018-04-032-0/+120
* | | Merge branch 'docs-update_security_products_examples' into 'master'Marcia Ramos2018-04-033-6/+30
|\ \ \ | |/ / |/| |
| * | Update Security Products examples documentationOlivier Gonzalez2018-04-033-6/+30
|/ /
* | Merge branch '43745-store-metadata-checksum-for-artifacts' into 'master'Kamil Trzciński2018-04-033-2/+12
|\ \
| * | Add changelogShinya Maeda2018-04-041-0/+5
| * | Store metadata checksum for artifacts43745-store-metadata-checksum-for-artifactsShinya Maeda2018-04-032-2/+7
* | | Merge branch '44902-remove-rake-test-ci' into 'master'Robert Speicher2018-04-032-5/+5
|\ \ \
| * | | Remove test_ci rake taskTakuya Noguchi2018-04-032-5/+5
* | | | Merge branch 'zj-bump-gitaly' into 'master'Sean McGivern2018-04-032-1/+6
|\ \ \ \
| * | | | Upgrade Gitaly server verionZeger-Jan van de Weg2018-04-032-1/+6
* | | | | Merge branch 'docs-add-qa-step-to-database-mr-template' into 'master'Yorick Peterse2018-04-031-4/+7
|\ \ \ \ \
| * | | | | Update the 'Database Changes' MR template to add a step for QAdocs-add-qa-step-to-database-mr-templateRémy Coutable2018-01-241-4/+7
* | | | | | Merge branch '44254-codequality-jobs-are-failing-silently-with-an-empty-codec...Rémy Coutable2018-04-031-0/+3
|\ \ \ \ \ \
| * | | | | | Don't set the tag for the job since it needs44254-codequality-jobs-are-failing-silently-with-an-empty-codeclimate-json-fileRémy Coutable2018-04-031-0/+3
* | | | | | | Merge branch 'jprovazn-comment-thread' into 'master'Fatih Acet2018-04-0323-110/+161
|\ \ \ \ \ \ \
| * | | | | | | Refactor discussions/notes codeJan Provaznik2018-04-0323-110/+161
|/ / / / / / /
* | | | | | | Merge branch '44425-use-gitlab_environment' into 'master'Douwe Maan2018-04-032-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Use gitlab_environment because we need:Lin Jen-Shin2018-04-032-1/+6
* | | | | | | | Merge branch 'blackst0ne-rails5-update-bin-rspec' into 'master'Rémy Coutable2018-04-031-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | [Rails5] Allow using `RAILS5` env with rspecblackst0ne-rails5-update-bin-rspecblackst0ne2018-04-031-0/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '44861-mark-gitaly-nplus-one-again' into 'master'Rémy Coutable2018-04-032-4/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-againLin Jen-Shin2018-04-032-4/+24
* | | | | | | | | Merge branch 'fix/qa/gb/use-project-path-in-package-and-qa-action' into 'master'Rémy Coutable2018-04-032-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Correctly check whether package-and-qa runs for EEfix/qa/gb/use-project-path-in-package-and-qa-actionGrzegorz Bizon2018-04-031-1/+2
| * | | | | | | | Use project path in package-and-qa to fetch scriptGrzegorz Bizon2018-04-031-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/sm/fix-wrong-error-handling-in-update-page-service' into 'm...Kamil Trzciński2018-04-032-11/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | missing the public folder is InvaildStateErrorfix/sm/fix-wrong-error-handling-in-update-page-serviceShinya Maeda2018-03-302-6/+10
| * | | | | | | | Fix bad namingShinya Maeda2018-03-301-2/+2
| * | | | | | | | Fix wrong error handling in update page serviceShinya Maeda2018-03-302-9/+42
* | | | | | | | | Merge branch 'add-documentation-about-backporting-changes' into 'master'Tim Zallmann2018-04-031-0/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add doc about backporting changes from EE to CEadd-documentation-about-backporting-changesAndré Luís2018-03-261-0/+14
* | | | | | | | | Merge branch 'rs-performance-bar-for-admins' into 'master'Rémy Coutable2018-04-032-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Always allow the performance bar to be enabled for adminsrs-performance-bar-for-adminsRobert Speicher2018-04-022-0/+7
* | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-labels.feature' into ...Rémy Coutable2018-04-038-154/+193
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace the `project/issues/labels.feature` spinach test with an rspec analogblackst0ne2018-04-038-154/+193
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '44921-wrong-user-in-push-notification-email' into 'master'Grzegorz Bizon2018-04-034-3/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix body of email when commits are pushed to an MRSean McGivern2018-04-034-3/+34
* | | | | | | | | | | Merge branch 'qa/gb/do-not-auto-retry-package-and-qa-action' into 'master'Rémy Coutable2018-04-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Do not retry package-and-qa manual action on failureqa/gb/do-not-auto-retry-package-and-qa-actionGrzegorz Bizon2018-04-021-0/+1
* | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-issues.feature' into ...Rémy Coutable2018-04-0329-580/+532
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replace the `project/issues/issues.feature` spinach test with an rspec analogblackst0ne2018-04-0329-580/+532
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'sh-move-sidekiq-exporter-logs' into 'master'Sean McGivern2018-04-034-2/+25
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status