summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Fix invalid Gitaly ClientPath configgitaly-client-path-fixKim "BKC" Carlbäcker2017-11-021-1/+1
|
* 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
| | | | | | | | Navigating to the "Members" section of a project would omit the relative URL root path. Fix the redirection and eliminate the need for a redirection in the first place. Fix other redirections failing to work with relative roots
* Added ssh fingerprint, gitlab ci and pages information in an instance ↵Francisco Lopez2017-10-251-4/+5
| | | | | | configuration page Closes #25142
* Merge branch 'backort_routes_group_routes_from_ee' into 'master'Douwe Maan2017-10-231-35/+35
|\ | | | | | | | | | | | | Backport EE changes to group routes Closes gitlab-ee#3794 See merge request gitlab-org/gitlab-ce!14973
| * 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
|\ \ | |/ |/| | | | | | | | | Show Gitaly data in the peek performance bar Closes #39231 See merge request gitlab-org/gitlab-ce!14949
| * 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
| | | | | | | | | | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
* | Fix PikadayFilipa Lacerda2017-10-181-0/+7
|/
* Update database.yml.postgresqlbogdanvlviv2017-10-171-11/+10
| | | | host is omitted by default
* Set 'staging specific' in database.yml.mysqlbogdanvlviv2017-10-171-3/+18
|
* Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-172-19/+0
|\ | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-172-19/+0
| | | | | | | | Instead of from the configuration file
* | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-172-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "boards" from TOP_LEVEL_ROUTES Closes #39073 See merge request gitlab-org/gitlab-ce!14861
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "GitlabUsagePingWorker is not running on GitLab.com" See merge request gitlab-org/gitlab-ce!14867
| * | | | Make usage ping scheduling more robust39017-gitlabusagepingworker-is-not-running-on-gitlab-comSean McGivern2017-10-161-5/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On GitLab.com, we see that cron jobs sometimes don't run. This appears to be because the process that polls for current cron jobs only has a 60 second validity period, so if (for whatever reason) it misses those 60 seconds, we have to wait until the next execution. For the usage ping, this is particularly problematic, as that's only scheduled to run once a week. Changing it to run for every minute in a 10 minute period should work around this, if the above diagnosis is correct. The job itself obtains an exclusive lease for 24 hours, so rescheduling in quick succession is safe.
* | | | Merge branch 'ide-update-monaco' into 'master'Jacob Schatz2017-10-161-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Upgrading Monaco Closes #38607 See merge request gitlab-org/gitlab-ce!14629
| * | | 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 milestones Closes #30241 See merge request gitlab-org/gitlab-ce!14806
| * | | 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 database Closes #37534 See merge request gitlab-org/gitlab-ce!14688
| * | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534.
* | | Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-0/+1
|/ /
* | Merge branch 'master' into ↵Shinya Maeda2017-10-073-3/+5
|\ \ | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ Merge branch 'api-sentry-extra' into 'master'Douwe Maan2017-10-061-1/+3
| |\ \ | | | | | | | | | | | | | | | | Send API parameters as extra data for sentry errors See merge request gitlab-org/gitlab-ce!14644
| | * | 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_connect See merge request gitlab-org/gitlab-ce!14372
| | * | | Upgrade doorkeeper-openid_connectMarkus Koller2017-09-202-2/+2
| | | | |
* | | | | Merge branch 'master' into ↵Shinya Maeda2017-10-062-9/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-052-9/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add external link for online artifacts Closes #34102 See merge request gitlab-org/gitlab-ce!14399
| | * | | | 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 ↵Kamil Trzcinski2017-10-052-2/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | Merge branch 'master' into ↵Douwe Maan2017-10-0510-16/+40
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
| * | | | | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | and rubocop fixes
| * | | | | moved devise_for :emails to live under `profiles`, removing the needBrett Walker2017-09-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | for `emails` to be a top level route
View Lorry Controller Status