d6cd7006ae
Fix broken Members link when relative URL root paths are used
...
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
2017-10-27 14:32:38 -07:00
294f40e2c8
Added ssh fingerprint, gitlab ci and pages information in an instance configuration page
...
Closes #25142
2017-10-25 23:51:26 +03:00
a441e7a74f
Merge branch 'backort_routes_group_routes_from_ee' into 'master'
...
Backport EE changes to group routes
Closes gitlab-ee#3794
See merge request gitlab-org/gitlab-ce!14973
2017-10-23 13:37:41 +00:00
3f9022cf78
Merge branch 'zj-peek-gitaly' into 'master'
...
Show Gitaly data in the peek performance bar
Closes #39231
See merge request gitlab-org/gitlab-ce!14949
2017-10-23 10:17:49 +00:00
5e2a748bb7
Add Gitaly data to the Peek performance bar
2017-10-23 10:14:41 +03:00
ee1b89ae2b
Backport EE changes to group routes
2017-10-22 21:55:58 +03:00
b7e3503372
Fix inability to delete container registry tags
...
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
2017-10-18 19:38:12 -07:00
941c11824a
Fix Pikaday
2017-10-18 11:31:01 +00:00
209e656e43
Update database.yml.postgresql
...
host is omitted by default
2017-10-17 21:15:01 +03:00
ac3713e947
Set 'staging specific' in database.yml.mysql
2017-10-17 21:12:46 +03:00
4bbdab764d
Merge branch 'bvl-circuitbreaker-improvements' into 'master'
...
Make the circuitbreaker configurable at runtime
See merge request gitlab-org/gitlab-ce!14842
2017-10-17 10:43:05 +00:00
79e889122b
Merge branch 'bvl-group-trees' into 'master'
...
Show collapsible tree on the project show page
Closes #30343
See merge request gitlab-org/gitlab-ce!14055
2017-10-17 10:03:03 +00:00
619021fd7a
Read circuitbreaker settings from `Gitlab::CurrentSettings`
...
Instead of from the configuration file
2017-10-17 11:50:32 +02:00
d5bfb93152
Merge branch 'fix_global_board_routes_39073' into 'master'
...
Remove "boards" from TOP_LEVEL_ROUTES
Closes #39073
See merge request gitlab-org/gitlab-ce!14861
2017-10-16 15:24:51 +00:00
07e3308967
Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into 'master'
...
Resolve "GitlabUsagePingWorker is not running on GitLab.com"
See merge request gitlab-org/gitlab-ce!14867
2017-10-16 15:06:58 +00:00
b69861c204
Merge branch 'ide-update-monaco' into 'master'
...
Upgrading Monaco
Closes #38607
See merge request gitlab-org/gitlab-ce!14629
2017-10-16 14:48:45 +00:00
f4e94c6ff7
Make usage ping scheduling more robust
...
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.
2017-10-16 10:31:20 +01:00
f9b89ef8aa
Move global boards routes under "-" scope
2017-10-13 11:28:25 +03:00
077ecf8a80
Fixes the Problem with the Repo Editor Loading Typescript Services
2017-10-12 12:17:18 +02:00
2c25a7ae34
Nest the group_children_path inside the canonical group path
2017-10-12 11:36:55 +02:00
16a97d644c
Removed d3.js from the users and graphs bundle
2017-10-11 14:03:19 -05:00
90f95f2b8c
Merge branch 'move_markdown_preview_to_concern' into 'master'
...
Add support for markdown preview to group milestones
Closes #30241
See merge request gitlab-org/gitlab-ce!14806
2017-10-11 12:26:41 +00:00
64bb19069d
Add support for markdown preview to group milestones
2017-10-11 20:03:19 +11:00
4f47fe6a6c
Add - before google_api/auth/callback
2017-10-11 15:49:55 +09:00
741fb49378
Merge branch 'master' into bvl-group-trees
2017-10-10 17:53:42 +02:00
546b18b903
Merge branch 'tc-geo-read-only-idea' into 'master'
...
Create idea of read-only database
Closes #37534
See merge request gitlab-org/gitlab-ce!14688
2017-10-07 11:01:21 +00:00
265b1a3b72
Show confirmation modal before deleting account
2017-10-06 20:40:41 +00:00
d13669716a
Create idea of read-only database
...
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 .
2017-10-06 22:37:40 +02:00
830c770a53
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-07 00:27:15 +09:00
7f8e720f41
Merge branch 'api-sentry-extra' into 'master'
...
Send API parameters as extra data for sentry errors
See merge request gitlab-org/gitlab-ce!14644
2017-10-06 13:41:01 +00:00
91e530df24
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-06 21:29:03 +09:00
de035a0d5e
Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'
...
Upgrade doorkeeper-openid_connect
See merge request gitlab-org/gitlab-ce!14372
2017-10-06 09:23:23 +00:00
60a35e4230
Send API parameters as extra data for sentry errors
2017-10-05 18:31:34 -03:00
0fbe0406fd
Change `/google_api/authorizations/` to `/google_api/auth/`.
2017-10-05 17:44:11 +02:00
ce87f42dc9
Merge branch '34102-online-view-of-artifacts-fe' into 'master'
...
Add external link for online artifacts
Closes #34102
See merge request gitlab-org/gitlab-ce!14399
2017-10-05 15:03:17 +00:00
aba71835f3
Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-05 14:27:42 +02:00
0c0c2ecd99
Merge branch 'master' into 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
2017-10-05 12:48:22 +02:00
88cc9d5294
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-05 14:49:16 +09:00
960559aa68
Don't use canonical path for group children
2017-10-04 22:49:41 +02:00
80780018a9
Update `children` route to handle projects and groups
2017-10-04 22:46:49 +02:00
376a8c66c1
Remove the subgroups path on a group
2017-10-04 22:46:49 +02:00
ca538899b6
Add a `WithPagination` concern to reuse across serializers
2017-10-04 22:46:49 +02:00
d5486807ba
Incorporate feedback
2017-10-04 21:01:27 +02:00
decf044369
Merge branch 'master' into 34102-online-view-of-artifacts-fe
2017-10-04 10:56:03 -05:00
27e18f182f
Merge branch 'gitaly-fetch-ref' into 'master'
...
Let fetch_ref pull from Gitaly instead of from disk
Closes gitaly#585
See merge request gitlab-org/gitlab-ce!14588
2017-10-04 12:07:17 +00:00
412571a4df
Load only the currently needed JS locale file
2017-10-04 11:23:52 +00:00
147e2b21be
Let fetch_ref pull from Gitaly instead of from disk
2017-10-04 12:57:41 +02:00
c958c201b7
Merge branch '31050-registry-image-lists' into 'master'
...
Lazy load and paginate registry image list
Closes #31050
See merge request gitlab-org/gitlab-ce!14303
2017-10-04 07:58:34 +00:00
c6d53250de
Specify defaults, fix policies, fix db columns
2017-10-04 00:20:47 +02:00
65b4627d3e
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-04 02:59:11 +09:00
Stan Hu
Francisco Lopez
Douwe Maan
Rémy Coutable
Zeger-Jan van de Weg
Valery Sizov
Filipa Lacerda
bogdanvlviv
Bob Van Landuyt
Jacob Schatz
Sean McGivern
Tim Zallmann
Jose Ivan Vargas
Sean McGivern
Vitaliy @blackst0ne Klachkov
Shinya Maeda
Winnie Hellmann
Toon Claes
Alejandro Rodríguez
Kamil Trzcinski
Nick Thomas
Douwe Maan
Eric Eastwood
Jacob Vosmaer
Grzegorz Bizon