aeeba4be36
Merge branch '54621_missing_example' into 'master'
...
Add missing 'export' example for CI_API_V4_API_URL
See merge request gitlab-org/gitlab-ce!26878
2019-04-03 08:57:59 +00:00
07cc188535
Merge branch '53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label' into 'master'
...
Resolve "Quick Action Adds Multiple Labels to Issue If Middle Words Overlap with Existing Label"
Closes #53459
See merge request gitlab-org/gitlab-ce!26602
2019-04-03 08:28:10 +00:00
128871be75
Merge branch 'ekigbo-extend-timezone-dropdown' into 'master'
...
Extend timezone dropdown
See merge request gitlab-org/gitlab-ce!26311
2019-04-03 08:27:17 +00:00
46fdec84dd
Extend timezone dropdown
...
Adds optional paramters to the constructor to allow
reuse of the timezone dropdown on other pages
2019-04-03 08:27:16 +00:00
1926bb24d8
Merge branch 'fix-broken-master-release-permission-ce' into 'master'
...
Backport: Fix Release permission spec
See merge request gitlab-org/gitlab-ce!26897
2019-04-03 08:24:39 +00:00
a374d690e7
Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'
...
Fixes duplicate diff too large error messages
Closes #59802
See merge request gitlab-org/gitlab-ce!26857
2019-04-03 08:05:52 +00:00
16a935f28f
Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'
...
Resolve CE/EE difference in FE dependency files
See merge request gitlab-org/gitlab-ce!26856
2019-04-03 08:04:40 +00:00
dfe2fabfe7
Merge branch 'gl-set-up-gitlab-ui-danger-reviewer' into 'master'
...
Set specific reviewers for the GitLab UI WG effort
See merge request gitlab-org/gitlab-ce!26760
2019-04-03 07:37:15 +00:00
b7c818192d
Merge branch '47771-highlighting-in-diff' into 'master'
...
Enabled text selection in diffs in Web IDE
Closes #47771
See merge request gitlab-org/gitlab-ce!26721
2019-04-03 07:34:41 +00:00
d11d8fa948
Merge branch 'patch-49' into 'master'
...
Fix comment typo in noteable_note.vue
See merge request gitlab-org/gitlab-ce!26855
2019-04-03 07:33:17 +00:00
e01d3517d5
Merge branch 'patch-49' into 'master'
...
remove html tag
See merge request gitlab-org/gitlab-ce!26885
2019-04-03 06:57:08 +00:00
e3b38ae09d
Fix Release permission spec
...
We recently changed the permission model to disallow guests to read
Releases. The spec should be updated as well according to the
expectation.
2019-04-03 13:55:39 +07:00
6c56bf3186
Merge branch 'docs/ci-refs-at-symbol' into 'master'
...
Document matching refs with an at-symbol
See merge request gitlab-org/gitlab-ce!26755
2019-04-03 04:33:56 +00:00
00f1121570
Document matching refs with an at-symbol
...
At-symbols are used to match a ref to a specific repository path.
Currently this is done by string splitting the ref pattern on the
at-symbol. In order to pattern match a literal `@` you must use
ruby's unicode character matching `\u{0040}`.
2019-04-03 04:33:55 +00:00
ccdf7a9390
Merge branch 'fix-format-typo-two-factor-auth' into 'master'
...
Fix format typo on generate-new-recovery-codes-using-ssh
See merge request gitlab-org/gitlab-ce!26819
2019-04-03 03:40:38 +00:00
14e2e61de7
Merge branch 'doc/fix-typo-on-tests-style-guide' into 'master'
...
Fix typo on tests style guide
See merge request gitlab-org/gitlab-ce!26859
2019-04-03 02:25:59 +00:00
645303c7e7
Merge branch '59131-set-the-size-of-instance-system-message-text-12px' into 'master'
...
Resolve "Set the size of instance system message text 12px"
Closes #59131
See merge request gitlab-org/gitlab-ce!26293
2019-04-02 22:37:04 +00:00
4ab132e9bb
Merge branch 'renovate/gitlab-svgs-1.x' into 'master'
...
Update dependency @gitlab/svgs to ^1.58.0
See merge request gitlab-org/gitlab-ce!26881
2019-04-02 21:13:09 +00:00
0e9b478707
remove html tag
2019-04-02 21:08:25 +00:00
a4182ed615
Merge branch 'qa-increase-depth-of-review-deploy-job' into 'master'
...
Use the default fetch/clone depth for the review-deploy job
See merge request gitlab-org/gitlab-ce!26868
2019-04-02 20:38:52 +00:00
17c1b20f9d
Merge branch '55980-remove-add-issue-on-blank-list' into 'master'
...
Remove non-functional add issue button on welcome list
Closes #55980
See merge request gitlab-org/gitlab-ce!26742
2019-04-02 20:23:24 +00:00
2378dde2e2
Remove non-functional add issue button on welcome list
2019-04-02 20:23:23 +00:00
5570ce7dde
Merge branch 'revert-a3fd1a13' into 'master'
...
Revert "Monitor GraphQL with Prometheus"
See merge request gitlab-org/gitlab-ce!26864
2019-04-02 20:05:57 +00:00
0c45e268a1
Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"
...
This reverts merge request !26569
2019-04-02 20:05:56 +00:00
f3b81ee6f2
Update dependency @gitlab/svgs to ^1.58.0
2019-04-02 19:26:26 +00:00
3a9e3aa9ef
Add missing 'export' example for CI_API_V4_API_URL
...
In issue #54621 a new variable CI_API_V4_API_URL was introduced, but
some of the documentation was omitted. Having an example output is
always nice.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2019-04-02 19:21:46 +02:00
9f6ab1a595
Merge branch 'docs-revamp-ci-variables' into 'master'
...
Docs: revamp/reorg CI variables
Closes #58626
See merge request gitlab-org/gitlab-ce!26336
2019-04-02 17:18:44 +00:00
6fe5d402ea
Add screenshots for variables
...
- Variables overview
- Variables triggered via manual pipeline
2019-04-02 17:18:44 +00:00
d80fbb73ee
Merge branch 'if-53411-remove_ignore_column' into 'master'
...
Remove ignore column for PersonalAccessToken#token
Closes #53411
See merge request gitlab-org/gitlab-ce!25213
2019-04-02 16:48:55 +00:00
ea283bbc6b
Remove ignore column for PersonalAccessToken#token
2019-04-02 16:48:55 +00:00
9240118691
Merge branch 'ce-8317-operations-dashboard-usage-ping' into 'master'
...
Add dashboard scope for operations dashboard usage ping
See merge request gitlab-org/gitlab-ce!26727
2019-04-02 16:44:55 +00:00
3bc3018518
Fix quick actions add label name middle word overlaps
...
Fixes quick actions add label when adding a label which name middle
word overlaps with another label name: for example adding "A B C" when
also label "B" exists.
With the fix only the label "A B C" is correctly added, previously
also the label "B" was added due to the middle word overlaps.
2019-04-02 18:28:25 +02:00
23c353515f
Merge branch 'ce-reduce-diff-in-spec-models' into 'master'
...
[CE] Reduce diff with EE in `spec/models`
See merge request gitlab-org/gitlab-ce!26847
2019-04-02 15:37:35 +00:00
3d24e7225e
Merge branch 'ce-6119-extract-ee-specific-files-lines-for-spec-services-groups' into 'master'
...
Remove groups destroy race condition spec
See merge request gitlab-org/gitlab-ce!26851
2019-04-02 14:57:16 +00:00
2614273328
Remove duplicate declaration of $system-header-height
2019-04-02 14:48:15 +00:00
65ede29537
Update system message banner font size to 12px
2019-04-02 14:48:15 +00:00
723f936fb1
Merge branch 'sh-cache-pipeline-find-commits' into 'master'
...
Cache FindCommit results in pipelines view
See merge request gitlab-org/gitlab-ce!26776
2019-04-02 14:29:49 +00:00
1058bb9045
Use the default fetch/clone depth for the review-deploy job
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-02 16:10:56 +02:00
8b9da458ec
Merge branch 'docs-image-realignment' into 'master'
...
Docs: image realignment
See merge request gitlab-org/gitlab-ce!26799
2019-04-02 13:31:18 +00:00
01422c9156
Docs: image realignment
2019-04-02 13:31:18 +00:00
3ca0796ef6
Merge branch 'docs-move-variables-ref-to-new-doc' into 'master'
...
Docs: move variables reference to its own doc
See merge request gitlab-org/gitlab-ce!26763
2019-04-02 13:30:27 +00:00
88a0eab992
Fix conflicts with master
...
Pull master
2019-04-02 13:30:26 +00:00
4ca1c51e25
Merge branch 'jv-gitaly-unlink-repository' into 'master'
...
Stop calling UnlinkRepositoryFromObjectPool RPC
Closes #59777
See merge request gitlab-org/gitlab-ce!26821
2019-04-02 13:20:27 +00:00
35b9274f12
Stop calling UnlinkRepositoryFromObjectPool RPC
...
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59777 .
In earlier iterations of our implementation of Git object deduplication
we thought we would be making extensive use of Git remotes in pool
repositories in the future, and that we should manage these remotes
carefully from the start. We now expect we only care about one remote,
namely the source project. The other remotes are there only for forensic
purposes.
Before this MR we tried to also remove pool remotes when member projects
got deleted, with the UnlinkRepositoryFromObjectPool RPC. This is
fragile when there are race conditions (see
https://gitlab.com/gitlab-org/gitaly/issues/1568#note_153955926 ). We
have spent some time making this RPC less fragile in
https://gitlab.com/gitlab-org/gitaly/merge_requests/1151 but looking at
this problem again, I think we should just stop calling it.
2019-04-02 13:20:26 +00:00
4b9dbec33c
Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'
...
Jarv/dev to gitlab 2019 04 02
Closes #2810
See merge request gitlab-org/gitlab-ce!26846
2019-04-02 12:56:40 +00:00
3da182cc75
Fix typo on tests style guide
2019-04-02 14:36:21 +02:00
eebf24ead5
Fixes duplicate diff too large error messages
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
2019-04-02 13:24:36 +01:00
784b175602
Merge branch 'qa/document_click_vs_go_to' into 'master'
...
Document `click_` vs. `go_to_` standard for e2e tests
Closes #59645
See merge request gitlab-org/gitlab-ce!26825
2019-04-02 12:16:47 +00:00
2179a98391
Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'
...
Backport: Expose merge request pipeline parameters for MR widget
See merge request gitlab-org/gitlab-ce!26826
2019-04-02 12:03:21 +00:00
f802aef983
Merge branch 'diff-tree-mobile-bug' into 'master'
...
Fixed positioning of the diff tree list on mobile
Closes #59739
See merge request gitlab-org/gitlab-ce!26820
2019-04-02 11:28:39 +00:00
Grzegorz Bizon
Sean McGivern
Filipa Lacerda
Ezekiel Kigbo
Rémy Coutable
Tim Zallmann
Phil Hughes
Evan Read
Shinya Maeda
Cody Mize
Sanad Liaquat
Mike Greiling
Clement Ho
William Chia
Douglas Barbosa Alexandre
Donald Cook
Robert Speicher
Jan Provaznik
Lukas 'Eipi' Eipert
Olliver Schinagl
Marcia Ramos
Kamil Trzciński
Imre Farkas
Jacopo
Lin Jen-Shin
Dennis Tang
Achilleas Pipinellis
Marcel Amirault
Jacob Vosmaer
Walmyr Lima