summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' into mc-uiDouwe Maan2016-08-151-1/+4
| |\ \ \ \ \ \ \
| * | | | | | | | Remove undo endpointSean McGivern2016-08-121-1/+0
| * | | | | | | | REMOVE THIS COMMIT: allow undoing last resolutionSean McGivern2016-08-121-0/+1
| * | | | | | | | Allow resolving conflicts in MR controllerSean McGivern2016-08-121-0/+1
| * | | | | | | | Added routes for conflicts in merge requests page.Fatih Acet2016-08-121-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Annabel Dunstone2016-08-161-0/+5
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-0/+5
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-1616-125/+233
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-151-1/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-151-0/+1
| | * | | | | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-1/+5
| | |/ / / / /
| * | | | | | Add coverage report badge metadata classGrzegorz Bizon2016-08-151-1/+4
| |/ / / / /
| * | | | | Instrument Project.visible_to_userYorick Peterse2016-08-121-0/+3
| * | | | | Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-111-2/+2
| |\ \ \ \ \
| | * | | | | Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-111-2/+2
| * | | | | | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-113-7/+23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-099-37/+78
| | |\ \ \ \ \
| | * | | | | | Handle custom Git LFS content typeJacob Vosmaer2016-07-221-0/+7
| | * | | | | | Remove obsolete codeJacob Vosmaer2016-07-221-3/+0
| | * | | | | | Add LFS controllersJacob Vosmaer2016-07-221-4/+16
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'decouple-secret-keys' into 'master' Douwe Maan2016-08-101-33/+70
| |\ \ \ \ \ \
| | * | | | | | Ignore Rails/Exit cop in initializerSean McGivern2016-08-041-1/+1
| | * | | | | | Clarify intentions of secret token initializerSean McGivern2016-08-031-35/+55
| | * | | | | | Give priority to environment variablesSean McGivern2016-08-031-4/+20
| | * | | | | | Store all secret keys in secrets.ymlSean McGivern2016-08-031-24/+16
| | * | | | | | Store OTP secret key in secrets.ymlSean McGivern2016-08-031-36/+45
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-095-46/+62
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Added Redis Sentinel support documentationGabriel Mazetto2016-08-041-1/+1
| | * | | | | Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-08-041-0/+4
| | * | | | | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-041-16/+16
| | * | | | | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-041-1/+1
| | * | | | | Make sidekiq get config settings from Gitlab::RedisConfigGabriel Mazetto2016-08-041-8/+6
| | * | | | | Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-044-38/+52
| * | | | | | Update to send changed password notification emailsTom Bell2016-08-051-0/+3
| |/ / / / /
| * | | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-3/+3
| |\ \ \ \ \
| | * | | | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-3/+3
| * | | | | | Instrument Gitlab::Highlightinstrument-gitlab-highlightYorick Peterse2016-08-031-0/+3
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-021-7/+11
| |\ \ \ \ \
| | * | | | | Allow branch names ending with .json for graph and network page (!5579)winniehell2016-08-021-7/+11
| | |/ / / /
| * | | | | Instrument the Repository classinstrument-repository-classYorick Peterse2016-08-021-0/+1
| |/ / / /
| * | | | Fix RequestProfiler::Middleware error when code is reloaded in developmentfix/request-profiler-middleware-error-on-reloadAhmad Sherif2016-08-011-0/+2
| * | | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-011-1/+1
| |\ \ \ \
| | * | | | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-291-1/+1
| | * | | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-291-1/+1
| | | |_|/ | | |/| |
| * | | | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike2016-07-311-0/+2
| |/ / /
| * | | Change requests_profiles resource constraint to catch virtually any filefix/requests-profiles-controller-does-not-catch-certain-filesAhmad Sherif2016-07-271-1/+1
| * | | Merge branch '14584-remove-routes-that-we-do-not-use-anymore' into 'master' Rémy Coutable2016-07-271-12/+10
| |\ \ \
| | * | | Remove useless new route14584-remove-routes-that-we-do-not-use-anymoreRémy Coutable2016-07-271-1/+1
| | * | | Add route for Import::GithubController#newRémy Coutable2016-07-261-1/+1
| | * | | Clean up unused routesJosef Strzibny2016-07-261-14/+12
| | | |/ | | |/|
View Lorry Controller Status