summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-0314-45/+109
|\
| * Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-021-1/+0
| * Optimize Emoji Sprite HandlingTim Zallmann2018-05-021-0/+1
| * Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-023-15/+24
| * Fix memory and performance issues in Karma test suiteMike Greiling2018-05-012-16/+64
| * Merge branch 'bvl-fix-openid-redirect' into 'master'Douwe Maan2018-04-302-1/+1
| |\
| | * Define custom base controller for DoorkeeperBob Van Landuyt2018-04-302-1/+1
| * | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-302-2/+3
| |\ \ | | |/ | |/|
| | * Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suiteTiago Botelho2018-04-262-2/+3
| * | Fix example config miss-alignment in uploads.object_store.connectionAlessio Caiazza2018-04-271-9/+9
| * | Add gitlab-pages admin ping rake taskJacob Vosmaer (GitLab)2018-04-273-0/+7
| * | remove peek performance_barPirate Praveen2018-04-261-1/+0
| |/
* | Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-267-21/+148
|\ \ | |/
| * Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' in...Rémy Coutable2018-04-251-1/+1
| |\
| | * Backport dev env check for storage settings deprecationOswaldo Ferreira2018-04-241-1/+1
| * | Do not preload settingsKamil Trzciński2018-04-243-1/+128
| |/
| * Merge branch '30998-add-babel-rewire-plugin' into 'master'Clement Ho2018-04-241-1/+1
| |\
| | * disable sourcemaps when generating coverage report to avoid out-of-memory errorsMike Greiling2018-04-231-1/+1
| * | Merge branch 'jej/refactor-omniauth-controller' into 'master'Douwe Maan2018-04-241-0/+18
| |\ \
| | * | Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones2018-04-221-0/+18
| | |/
| * | Merge branch 'sh-bump-lograge' into 'master'Rémy Coutable2018-04-241-18/+0
| |\ \
| | * | Bump lograge to 0.10.0 and remove monkey patchStan Hu2018-04-231-18/+0
| | |/
* | | Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-242-136/+1
|\ \ \ | |/ /
| * | 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
| |/
* | allow disabling/enabling group runners per projectAlexis Reigel2018-04-231-0/+1
|/
* [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
View Lorry Controller Status