summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rbRémy Coutable2018-04-232-10/+0
* Address latest feedbackRémy Coutable2018-04-231-1/+0
* Move Settings to its own file, isolate it from Rails and introduce Gitlab.rootRémy Coutable2018-04-232-129/+3
* Introduce spec/fast_spec_helper.rb to run spec files that don't rely on the w...Rémy Coutable2018-04-231-0/+2
* [Rails5] Avoid type casting in uniqueness validatorblackst0ne2018-04-191-0/+98
* Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master'Douwe Maan2018-04-182-0/+5
|\
| * Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'Sean McGivern2018-04-1010-42/+104
| |\
| * | Send emails for issues due tomorrowSean McGivern2018-03-302-3/+4
| * | Merge branch 'master' into stuartnelson3/gitlab-ce-stn/issue-due-emailSean McGivern2018-03-308-15/+138
| |\ \
| * | | Use cron for sending emailsStuart Nelson2018-03-262-1/+4
| * | | Add new queue to sidekick_queuesStuart Nelson2018-03-261-0/+1
* | | | Method to track recoverable exceptions in sentryBob Van Landuyt2018-04-171-10/+2
* | | | Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon2018-04-161-0/+1
|\ \ \ \
| * | | | jquery and webpack changedhaseeb2018-03-031-1/+0
| * | | | fix webpack.config.jshaseeb2018-02-281-5/+0
| * | | | embedded snippets supporthaseeb2018-02-282-0/+7
* | | | | Backport GitLab domain helper methodsOswaldo Ferreira2018-04-131-1/+1
* | | | | Replacing gollum libs for custom gitlab onesFrancisco Javier López2018-04-131-133/+0
* | | | | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-131-0/+5
|\ \ \ \ \
| * | | | | Deprecate legacy disk pathsZeger-Jan van de Weg2018-04-121-0/+5
| | |_|_|/ | |/| | |
* | | | | use commander for safer cli argument parsingLukas Eipert2018-04-111-5/+13
* | | | | move TEST_FILES variable to `process.env`Lukas Eipert2018-04-101-1/+1
* | | | | remove unnecessary webpack plugins assignment in karma configLukas Eipert2018-04-101-2/+0
* | | | | read which testfiles to run from CLILukas Eipert2018-04-101-1/+6
* | | | | Merge branch 'master' into winh-single-karma-testLukas Eipert2018-04-1060-528/+1069
|\ \ \ \ \ | |/ / / /
| * | | | Projects and groups badges settings UIFrancisco Javier López2018-04-083-1/+3
| * | | | Get rid of Redis when dealing with deploy tokensKamil Trzciński2018-04-061-2/+4
| * | | | Create barebones for DeploytokenMayra Cabrera2018-04-061-0/+6
| * | | | Add Kubernetes CPU/Mem usage totalsJoshua Lambert2018-04-061-5/+23
| * | | | Update labels for latency, cpu and memory metricsJose Ivan Vargas2018-04-061-3/+3
| * | | | Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-062-3/+6
| |\ \ \ \
| | * | | | Add new repository archive routeJames Ramsay2018-04-062-3/+6
| | | |_|/ | | |/| |
| * | | | [Rails5] Update `type_cast_*_database` methodsblackst0ne2018-04-061-14/+17
| * | | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-052-0/+8
| |\ \ \ \
| | * | | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-052-0/+8
| * | | | | Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ...Kamil Trzciński2018-04-051-1/+1
| |\ \ \ \ \
| | * | | | | Move leftovers from pipelines_settings_controller to settings/ci_cd_controllerTomasz Maczukin2018-04-041-1/+1
| * | | | | | Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-052-13/+16
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-042-13/+16
| | |/ / /
| * | | | Add support for Sidekiq JSON loggingStan Hu2018-04-043-1/+18
| |/ / /
| * | | Use katex min cssClement Ho2018-03-281-1/+1
| * | | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-282-1/+5
| |\ \ \
| | * | | Move project ci lint under '-' scope43603-ci-lint-supportMayra Cabrera2018-03-261-4/+4
| | * | | Make ci/lint page context aware:Mayra Cabrera2018-03-262-1/+5
| | | |/ | | |/|
| * | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-283-15/+4
| |\ \ \
| | * | | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-273-15/+4
| * | | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-271-1/+22
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Adds JWT omnianuth integrationTiago Botelho2018-03-201-1/+22
| * | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-274-0/+109
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2213-248/+217
| | |\ \ \