summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-071-10/+4
|\
| * Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-071-10/+4
* | Merge branch '34737-authentiq-oauth-feature-spec' into 'master'Douwe Maan2017-07-071-1/+4
|\ \ | |/ |/|
| * Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-071-1/+4
* | Native group milestonesFelipe Artur2017-07-071-1/+1
* | Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-071-1/+1
* | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-071-0/+8
|\ \
| * | Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda2017-07-071-4/+6
| * | Basic BE changeShinya Maeda2017-07-071-0/+6
| |/
* | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-073-10/+3
|\ \ | |/ |/|
| * Remove option to disable Gitaly completelyJacob Vosmaer2017-07-073-10/+3
* | Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan2017-07-061-1/+5
|\ \
| * | Fix shorter route helpers in production environmentfix-routes-in-production-modeSean McGivern2017-07-061-1/+5
| |/
* | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-062-2/+2
* | Just draw :legacy_builds34702-draw-legacy-buildsLin Jen-Shin2017-07-062-2/+23
* | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-0/+43
|\ \ | |/ |/|
| * Remove Authentiq from the OAuth login integration tests.Timothy Andrew2017-07-061-4/+0
| * Fix build for !11963.Timothy Andrew2017-07-061-22/+3
| * Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-061-0/+66
* | Merge branch '34636-update-prometheus-metrics-library' into 'master'Tim Zallmann2017-07-061-18/+68
|\ \
| * | Add NGINX metrics and other minor changes34636-update-prometheus-metrics-libraryJoshua Lambert2017-07-041-37/+53
| * | Add ELB metricsJoshua Lambert2017-07-031-2/+36
| |/
* | Merge branch 'dm-project-path-helpers-try-2' into 'master'Sean McGivern2017-07-053-3/+23
|\ \
| * | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-053-3/+23
| * | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-47/+0
| * | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-0/+47
| |\ \
| | * | Fix build for !11963.Timothy Andrew2017-07-031-22/+3
| | * | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-031-0/+66
| | |/
* | | Disable Flipper memoizer in tests to avoid transient failuressh-disable-flipper-midddlware-testsStan Hu2017-07-051-2/+4
|/ /
* | Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-043-1/+18
|/
* Merge branch 'enable-webpack-code-splitting' into 'master'Jacob Schatz2017-06-301-2/+2
|\
| * move webpack publicPath setup earlier in the bootstrap processes to avoid ES ...Mike Greiling2017-06-281-1/+2
| * dynamically set webpack publicPath when relative_url_root enabledMike Greiling2017-06-281-1/+0
* | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-291-12/+44
|\ \
| * | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-12/+44
* | | Merge branch 'shell-test-rebuild' into 'master'Robert Speicher2017-06-281-4/+6
|\ \ \
| * | | Reinstall shell on the test env if it's outdatedshell-test-rebuildAlejandro Rodríguez2017-06-191-4/+6
* | | | Merge branch 'cherry-pick-5ea675be' into 'master'Tim Zallmann2017-06-281-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-re...Phil Hughes2017-06-261-0/+1
* | | | Resolve "Navigation - Move contextual navigation to sidebar"Annabel Dunstone Gray2017-06-281-0/+1
| |_|/ |/| |
* | | Merge branch 'update_bootsnap_1.1.1' into 'master'Robert Speicher2017-06-271-0/+6
|\ \ \
| * | | Bump bootsnap to 1.1.1blackst0ne2017-06-271-0/+6
* | | | Merge branch 'master' into experimental-top-navPhil Hughes2017-06-239-28/+137
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'hot-reload' into 'master'Tim Zallmann2017-06-231-0/+4
| |\ \ \
| | * | | hot reloading for .vue fileshot-reloadSimon Knox2017-06-151-0/+4
| * | | | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-231-0/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Convert app/views/profiles/show.html.haml to bootstrap_formNick Thomas2017-06-221-0/+7
| * | | | Merge branch 'rs-revert-bootsnap' into 'master'Stan Hu2017-06-221-12/+0
| |\ \ \ \
| | * | | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-221-12/+0
| * | | | | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master'Yorick Peterse2017-06-222-14/+81
| |\ \ \ \ \
View Lorry Controller Status