cd08fd2363
Merge branch 'non-existing-repo-optimization' into 'master'
...
Avoid calling underlying methods on non-existing repos
See merge request gitlab-org/gitlab-ce!14962
2017-10-26 11:29:46 +00:00
c29d2c6a41
Merge branch 'api-configure-jira' into 'master'
...
Validate username/pw for Jiraservice, require them in the API
Closes #36621
See merge request gitlab-org/gitlab-ce!15025
2017-10-26 11:20:48 +00: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
3ddffec0d6
Merge branch '38178-fl-mr-notes-components' into 'master'
...
Moves placeholders components into shared folder with documentation.
See merge request gitlab-org/gitlab-ce!14964
2017-10-25 15:45:40 +00:00
53ab16f6ff
Merge branch 'gitaly-ff-merge-preparation' into 'master'
...
Move all rugged operation for ff_merge inside Gitlab::Git
Closes gitaly#683
See merge request gitlab-org/gitlab-ce!15011
2017-10-25 12:42:25 +00:00
e81d74b925
Merge branch '35199-case-insensitive-branches-search' into 'master'
...
Add case insensitive branches search
Closes #35199
See merge request gitlab-org/gitlab-ce!14995
2017-10-25 09:14:32 +00:00
a64601b929
Move all rugged operation for ff_merge inside Gitlab::Git
...
We also delete some unused code related to the aforementioned feature.
2017-10-24 14:31:52 -03:00
30a8d2def3
Merge branch 'gitaly-gl-username' into 'master'
...
Support `Gitaly::User`'s gl_username field
See merge request gitlab-org/gitlab-ce!15016
2017-10-24 13:59:44 +00:00
bf4e97fc83
Merge branch 'sh-memoize-logger' into 'master'
...
Memoize GitLab logger to reduce open file descriptors
Closes gitlab-ee#3664
See merge request gitlab-org/gitlab-ce!15007
2017-10-24 12:43:30 +00:00
324b3bbaca
Memoize GitLab logger to reduce open file descriptors
...
We see that in gitlab-org/gitlab-ee#3664 that if we log a lot of
data in Sidekiq workers, the number of open file descriptors
reaches over 1000. To avoid this, we can memoize the logger per
thread via RequestStore.
Closes gitlab-org/gitlab-ee#3664
2017-10-24 14:06:23 +03:00
525f043c29
Update factories for git push service
2017-10-24 13:40:22 +03:00
3dcdd4a1e8
Merge branch 'sh-fix-environment-write-ref' into 'master'
...
Fix the writing of invalid environment refs
Closes #39182
See merge request gitlab-org/gitlab-ce!14993
2017-10-24 09:22:21 +00:00
3548dc4b29
Merge branch '23000-pages-api' into 'master'
...
Resolve "Pages API"
Closes #23000
See merge request gitlab-org/gitlab-ce!13917
2017-10-24 09:18:03 +00:00
50aa340e37
Factories need to set required attributes
2017-10-24 12:17:41 +03:00
7fbefa3d04
Merge branch 'bvl-circuitbreaker-backoff' into 'master'
...
Circuitbreaker backoff and retries
Closes #37383 and #38231
See merge request gitlab-org/gitlab-ce!14933
2017-10-24 09:10:42 +00:00
cc17067085
Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'
...
Add new files & directories in the multi-file editor
Closes #38614
See merge request gitlab-org/gitlab-ce!14839
2017-10-24 09:06:55 +00:00
cc5ba3d907
Validate username/pw for Jiraservice, require them in the API
2017-10-24 10:35:21 +03:00
4969f486f2
Support `Gitaly::User`'s gl_username field
...
We also unify conversions from and to `Gitaly::User`s in the
`Gitlab::Git::User` class.
2017-10-23 17:31:48 -03:00
743050cede
Merge branch '37860-pipelines-page' into 'master'
...
Make pipelines table in MR view usable
See merge request gitlab-org/gitlab-ce!14941
2017-10-23 16:19:34 +00:00
d5e2f873db
Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' into 'master'
...
Refactor `have_http_status` into `have_gitlab_http_status` in the specs
Closes #35644
See merge request gitlab-org/gitlab-ce!14958
2017-10-23 14:55:57 +00:00
c2d943a7ea
Changes after review
2017-10-23 16:38:57 +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
08a8a3f963
Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'
...
Only cache the push event for the fork-source when it exists
Closes #39352
See merge request gitlab-org/gitlab-ce!14989
2017-10-23 13:37:29 +00:00
c147bccc45
Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdown
2017-10-23 14:01:22 +01:00
133e66d22d
spec fixes
2017-10-23 13:12:05 +01:00
9931ef4a8a
Merge branch 'fix-escaped-text-replacement' into 'master'
...
Fix escaped text replacement
Closes #37724
See merge request gitlab-org/gitlab-ce!14193
2017-10-23 11:56:28 +00:00
07a8c54355
Create new branch from dropdown.
2017-10-23 10:57:23 +00:00
705c15d7af
Allow enabling the circuitbreaker using an env variable
...
That way we can enable the circuitbreaker for just one host at a time.
2017-10-23 13:53:49 +03:00
591ee4e361
Perform the stat check multiple times when checking a storage
...
Instead of only checking once within a timeout, check multiple times
within a timeout.
That means with a timeout of 30 seconds and 3 retries. Each try would
be allowed 20 seconds.
2017-10-23 13:53:49 +03:00
4699cf77b6
added feature spec
2017-10-23 10:47:22 +01:00
4c186f99f2
fixed failing title test
2017-10-23 10:46:53 +01:00
60ce5155c8
fixed bug with tabs not switching correctly
...
clears all tmp files after cancelling edit mode
2017-10-23 10:46:27 +01:00
10dcaea1c3
failing spec fixes
2017-10-23 10:45:44 +01:00
389c852d12
correctly creates file in currently viewed directory
...
specs
2017-10-23 10:45:44 +01:00
5295f23b4b
Merge branch 'add-shared-vue-loading-button' into 'master'
...
Add loading button
See merge request gitlab-org/gitlab-ce!14883
2017-10-23 09:14:20 +00:00
430e767139
Implement backoff for the circuitbreaker
...
The circuitbreaker now has 2 failure modes:
- Backing off: This will raise the `Gitlab::Git::Storage::Failing`
exception. Access to the shard is blocked temporarily.
- Circuit broken: This will raise the
`Gitlab::Git::Storage::CircuitBroken` exception. Access to the shard
will be blocked until the failures are reset.
2017-10-23 12:02:23 +03:00
1881d4f8ec
Allow configuring new circuitbreaker settings from the UI and API
2017-10-23 12:02:23 +03:00
4ad8c9997d
Merge branch 'master' into 37860-pipelines-page
...
* master: (88 commits)
Fix deletion of container registry or images returning an error
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
Decrease ABC threshold to 54.28
Update VERSION to 10.2.0-pre
Update CHANGELOG.md for 10.1.0
Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
Fix the external URLs generated for online view of HTML artifacts
Use title as placeholder instead of issue title for reusability
Fix failure in current_settings_spec.rb
Clarify the difference between project_update and project_rename
URI decode Page-Title header to preserve UTF-8 characters
Update Gitaly version to v0.49.0
Decrease Perceived Complexity threshold to 14
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
Force non diff resolved discussion to display when collapse toggled
Added submodule support in multi-file editor
add note about after_script being run separately
Check for element before evaluate_script
Merge branch 'master-i18n' into 'master'
Update Prometheus gem to fix problems with other files overwriting current file
...
2017-10-23 11:04:28 +03:00
c1ed00e81d
Merge branch '38869-diff' into 'master'
...
Remove Diff class from global namespace
See merge request gitlab-org/gitlab-ce!14965
2017-10-23 07:52:21 +00:00
1cf35c3d1d
Add case insensitive branches search
2017-10-23 06:37:25 +03:00
69be3ce86f
Add loading button
...
Encompasses designs from
- https://gitlab.com/gitlab-org/gitlab-ce/issues/23206#note_43355199
- https://gitlab.com/gitlab-org/gitlab-ce/issues/29985#note_30417407
2017-10-23 05:24:42 +03:00
3bff85a4f6
Fix the writing of invalid environment refs
...
Environment names that contained a space would cause an error
in GitLab 10.1 because a new guard clause was introduced in
Repository#write_ref to prevent such references from
existing. Use the slug instead to ensure that the name
is valid.
Closes #39182
2017-10-23 04:15:26 +03:00
ee1b89ae2b
Backport EE changes to group routes
2017-10-22 21:55:58 +03:00
6f5ebc4bae
Only cache the event for the fork-source when it exists
...
It is possible for a fork not to have a source anymore, in this case
we don't need to keep track of the push event.
2017-10-22 20:24:47 +03:00
d310a2d0bc
Merge branch 'bvl-fix-group-atom-feed' into 'master'
...
Make sure we render events for projects within a group
Closes #39305
See merge request gitlab-org/gitlab-ce!14974
2017-10-22 14:13:35 +00:00
aca58784bd
Add pages domains API tests
2017-10-22 08:04:42 -05:00
de4d1bacc6
Add pages domains API schema
2017-10-22 08:04:42 -05:00
3c0be3cd41
Fix the external URLs generated for online view of HTML artifacts
2017-10-20 23:38:35 +01:00
e1122c9f6d
Merge branch 'multi-file-editor-submodules' into 'master'
...
Added submodule support in multi-file editor
See merge request gitlab-org/gitlab-ce!14971
2017-10-20 19:30:05 +00:00
59c03de56d
Use title as placeholder instead of issue title for reusability
2017-10-20 19:26:51 +00:00
Douwe Maan
Francisco Lopez
Phil Hughes
Rémy Coutable
Sean McGivern
Alejandro Rodríguez
Nick Thomas
Stan Hu
Robert Schilling
Grzegorz Bizon
Filipa Lacerda
Jacob Schatz
Bob Van Landuyt
George Andrinopoulos
Eric Eastwood
Valery Sizov
Travis Miller
Clement Ho