summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| |\ \ \ \ \
| | * | | | | Fix MySQL schema dump for `timestamp`mk-add-datetime-with-timezone-table-definitionMichael Kozono2017-06-221-4/+30
| | * | | | | Fix PostgreSQL schema dump for `timestamptz`Michael Kozono2017-06-221-5/+36
| | * | | | | Add `datetime_with_timezone` to table definitionMichael Kozono2017-06-221-6/+16
| | | |/ / / | | |/| | |
| * | | | | Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-221-0/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add the Flipper::Middleware::Memoizer middlewareRémy Coutable2017-06-211-0/+4
| | |/ / /
| * | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-227-26/+237
| |\ \ \ \ | | |/ / /
| | * | | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
| * | | | move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-161-0/+0
| * | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-1621-23/+233
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-0714-38/+195
| |\ \ \ \ \
| * | | | | | Additional Metrics testsPawel Chojnacki2017-06-051-1/+0
| * | | | | | Matched Metrics testsPawel Chojnacki2017-06-051-4/+10
| * | | | | | Add Prometheus Metrics Bundlekushalpandya2017-05-311-0/+1
| * | | | | | Add Y Label field to yml and responsesPawel Chojnacki2017-05-301-0/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-05-3014-54/+219
| |\ \ \ \ \ \
| * | | | | | | Add per deployment additional metricsPawel Chojnacki2017-05-251-0/+1
| * | | | | | | Additional metrics initial work, with working metrics listing, but without ac...Pawel Chojnacki2017-05-252-0/+31
* | | | | | | | Top navigation redesignPhil Hughes2017-06-211-0/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-211-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Enable gitaly token auth when testingJacob Vosmaer2017-06-201-0/+1
| * | | | | | | Rubocop and comment fixesJacob Vosmaer2017-06-201-2/+4
| * | | | | | | Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-191-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqkushalpandya2017-06-201-0/+9
|\ \ \ \ \ \ \
* | | | | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-1/+3
| |/ / / / / / |/| | | | | |
View Lorry Controller Status