summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-warden-hook-scope' into 'master'Grzegorz Bizon2018-05-071-5/+5
|\
| * Only run session related Warden hooks for user scopeDouwe Maan2018-05-071-5/+5
* | Enable prometheus metrics by defaultFelipe Artur2018-05-071-1/+8
* | Add signature verification badge to compare viewMarc2018-05-071-0/+1
* | Merge branch '33697-pipelines-json-endpoint' into 'master'Kamil Trzciński2018-05-071-0/+1
|\ \ | |/ |/|
| * Merge branch 'master' into 33697-pipelines-json-endpointMatija Čupić2018-05-025-31/+88
| |\
| * | Add stages_ajax endpoint to serve old HTMLKamil Trzciński2018-05-021-0/+1
* | | Merge branch 'bvl-enforce-terms' into 'master'Douwe Maan2018-05-041-0/+7
|\ \ \
| * | | Display terms to a userBob Van Landuyt2018-05-041-0/+7
* | | | Merge branch 'ash.mckenzie/fix-rails-sidekiq-rails-module-namespacing' into '...Douwe Maan2018-05-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Ensure we're using Rails, not Sidekiq::RailsAsh McKenzie2018-05-041-1/+1
* | | | Merge branch 'feature/runner-per-group' into 'master'Kamil Trzciński2018-05-041-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-0314-45/+109
| |\ \ \
| * \ \ \ Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-267-21/+148
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-242-136/+1
| |\ \ \ \ \
| * | | | | | allow disabling/enabling group runners per projectAlexis Reigel2018-04-231-0/+1
* | | | | | | Output some useful information when running the rails consoleBrett Walker2018-05-031-0/+10
* | | | | | | [Rails5] Fix trusted proxiesblackst0ne2018-05-031-0/+13
| |_|_|/ / / |/| | | | |
* | | | | | 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 '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
| |/
* | 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
View Lorry Controller Status