summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-073-3/+5
|\ \
| * \ Merge branch 'api-sentry-extra' into 'master'Douwe Maan2017-10-061-1/+3
| |\ \
| | * | Send API parameters as extra data for sentry errorsapi-sentry-extraAlejandro Rodríguez2017-10-051-1/+3
| * | | Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'Rémy Coutable2017-10-062-2/+2
| |\ \ \
| | * | | Upgrade doorkeeper-openid_connectMarkus Koller2017-09-202-2/+2
* | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-062-9/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-052-9/+11
| |\ \ \ \
| | * | | | Incorporate feedbackZeger-Jan van de Weg2017-10-041-1/+1
| | * | | | Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-045-4/+15
| | |\ \ \ \
| | * | | | | Redirect to pages daemonZeger-Jan van de Weg2017-10-031-9/+10
| | * | | | | Backend for HTML serving with GitLab PagesZeger-Jan van de Weg2017-10-021-0/+1
| | | |_|/ / | | |/| | |
* | | | | | Change `/google_api/authorizations/` to `/google_api/auth/`.Kamil Trzcinski2017-10-051-1/+1
* | | | | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-052-2/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-0510-16/+40
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-241-1/+1
| * | | | | moved devise_for :emails to live under `profiles`, removing the needBrett Walker2017-09-232-3/+3
| * | | | | small cleanup changes based on feedbackBrett Walker2017-09-231-1/+1
| * | | | | add verified/unverified labels to profile emails.Brett Walker2017-09-231-1/+5
| * | | | | remove unnecessary devise_scopeBrett Walker2017-09-231-2/+0
| * | | | | Send a confirmation email when the user adds a secondary email address. Utili...Brett Walker2017-09-231-0/+5
* | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-055-7/+22
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'gitaly-fetch-ref' into 'master'Sean McGivern2017-10-041-1/+3
| |\ \ \ \ \
| | * | | | | Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-041-1/+3
| * | | | | | Load only the currently needed JS locale fileTim Zallmann2017-10-043-5/+16
| |/ / / / /
| * | | | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-1/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
View Lorry Controller Status