summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-...Kamil Trzcinski2017-11-061-0/+1
|\
| * Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-031-1/+1
| |\
| * \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-023-4/+6
| |\ \
| * \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-314-9/+10
| |\ \ \
| * \ \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-293-39/+41
| |\ \ \ \
| * | | | | implement basic request inspector for use in Capybara testsMike Greiling2017-10-231-0/+1
* | | | | | Add Projects::Clusters::ApplicationsController testsAlessio Caiazza2017-11-031-1/+1
* | | | | | Fix typosAlessio Caiazza2017-11-031-1/+1
* | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-031-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'gitaly-client-path-fix' into 'master'Douwe Maan2017-11-031-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix invalid Gitaly ClientPath configgitaly-client-path-fixKim "BKC" Carlbäcker2017-11-021-1/+1
| | | |_|/ | | |/| |
* | | | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-033-4/+6
|\ \ \ \ \ | |/ / / /
| * | | | Add sudo API scopeDouwe Maan2017-11-021-2/+3
| * | | | Remove Private Token from User Settings > AccountDouwe Maan2017-11-021-1/+0
| * | | | Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to mon...sh-disable-unicorn-sampling-sidekiqStan Hu2017-11-011-1/+3
| |/ / /
* | | | Fix and add applications controllerKamil Trzcinski2017-11-021-2/+2
* | | | Improve backend structure of dataKamil Trzcinski2017-11-021-0/+4
|/ / /
* | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-0/+1
* | | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-rootStan Hu2017-10-274-9/+9
| |/ |/|
* | Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-251-4/+5
* | Merge branch 'backort_routes_group_routes_from_ee' into 'master'Douwe Maan2017-10-231-35/+35
|\ \
| * | Backport EE changes to group routesbackort_routes_group_routes_from_eeValery Sizov2017-10-221-35/+35
| |/
* | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-231-0/+1
|\ \ | |/ |/|
| * Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-231-0/+1
* | Fix inability to delete container registry tagsStan Hu2017-10-181-2/+7
* | Fix PikadayFilipa Lacerda2017-10-181-0/+7
|/
* Update database.yml.postgresqlbogdanvlviv2017-10-171-11/+10
* Set 'staging specific' in database.yml.mysqlbogdanvlviv2017-10-171-3/+18
* Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-172-19/+0
|\
| * Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-172-19/+0
* | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-172-1/+3
|\ \
| * | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-121-4/+2
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1013-14/+46
| |\ \
| * | | Don't use canonical path for group childrenBob Van Landuyt2017-10-041-3/+4
| * | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-0/+3
| * | | Remove the subgroups path on a groupBob Van Landuyt2017-10-041-1/+0
| * | | Add a `WithPagination` concern to reuse across serializersBob Van Landuyt2017-10-041-0/+1
* | | | Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-161-13/+13
|\ \ \ \
| * | | | Move global boards routes under "-" scopeValery Sizov2017-10-131-13/+13
| | |_|/ | |/| |
* | | | Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ...Douwe Maan2017-10-161-5/+7
|\ \ \ \
| * | | | Make usage ping scheduling more robust39017-gitlabusagepingworker-is-not-running-on-gitlab-comSean McGivern2017-10-161-5/+7
| |/ / /
* | | | Merge branch 'ide-update-monaco' into 'master'Jacob Schatz2017-10-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes the Problem with the Repo Editor Loading Typescript Serviceside-update-monacoTim Zallmann2017-10-121-1/+1
| |/ /
* | | Removed d3.js from the users and graphs bundle39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundlesJose Ivan Vargas2017-10-111-0/+3
* | | Merge branch 'move_markdown_preview_to_concern' into 'master'Sean McGivern2017-10-111-1/+3
|\ \ \
| * | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-111-1/+3
| | |/ | |/|
* | | Add - before google_api/auth/callbackShinya Maeda2017-10-111-3/+5
|/ /
* | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-071-0/+3
|\ \
| * | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-0/+3
* | | Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-0/+1
|/ /