root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
91,536 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

91536 Commits

Author SHA1 Message Date
Simon Knox f54e4eb10f Add docs for debugging Jest tests 2019-04-03 12:50:30 +00:00
Phil Hughes bc696947fd Merge branch '59942-fix-mr-swipe-diff-user-select' into 'master' 
MR image diff swipe view: Disable user-select on drag

Closes #59942

See merge request gitlab-org/gitlab-ce!26884
 2019-04-03 12:29:23 +00:00
ftab 7c61fb036e MR image diff swipe view: Disable user-select on drag 
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59942
 2019-04-03 12:29:22 +00:00
Robert Speicher e036cb04a2 Merge branch 'remaining-lib-differences' into 'master' 
Resolve remaining CE to EE differences in lib/

See merge request gitlab-org/gitlab-ce!26608
 2019-04-03 12:27:55 +00:00
Nick Thomas 12522d2256 Merge branch 'feature/webide_escaping' into 'master' 
Improve file handling of special characters in WebIDE

Closes #54376

See merge request gitlab-org/gitlab-ce!25727
 2019-04-03 11:38:47 +00:00
Kieran Andrews ebbcc17f24 Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce into feature/webide_escaping 2019-04-03 11:38:46 +00:00
Rémy Coutable 7700e02988 Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master' 
Only execute system hooks once when pushing tags

Closes #52560

See merge request gitlab-org/gitlab-ce!26888
 2019-04-03 10:20:50 +00:00
Sean McGivern 5a6908e3e5 Merge branch '59756-shared-example-already-defined' into 'master' 
Remove already defined shared example

Closes #59756

See merge request gitlab-org/gitlab-ce!26867
 2019-04-03 10:15:47 +00:00
Kamil Trzciński e604344c91 Merge branch 'ce-fj-10179-add-ports-to-web-ide-config' into 'master' 
CE Backport: Update Web IDE config to accept ports

Closes gitlab-ee#10179

See merge request gitlab-org/gitlab-ce!26679
 2019-04-03 09:50:55 +00:00
Francisco Javier López 6ee1d8cf77 Add port section to CI Image object 
In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179
we need several modifications on the CI config file. We are
adding a new ports section in the default Image object.

Each of these ports will accept: number, protocol and name.

By default this new configuration will be only enabled in
the Web IDE config file.
 2019-04-03 09:50:54 +00:00
Kamil Trzciński a7d3a5e439 Merge branch 'patch-50' into 'master' 
docs: add gitlab version for list jobs of a runner

See merge request gitlab-org/gitlab-ce!26815
 2019-04-03 09:49:55 +00:00
Rémy Coutable b1f9e05a73 Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master' 
Do not show system notes on commits in the MR page

Closes #55268

See merge request gitlab-org/gitlab-ce!26396
 2019-04-03 09:45:31 +00:00
Dmitriy Zaporozhets 478077747d Merge branch '47234-composable-auto-devops' into 'master' 
Resolve "Composable Auto DevOps"

Closes #47234

See merge request gitlab-org/gitlab-ce!26520
 2019-04-03 09:05:28 +00:00
Evan Read c3c5190c01 Merge branch '59498-add-troubleshooting-section-to-capture-errors-with-installing-applications-to-a-kubernetes-cluster' into 'master' 
Resolve "Add troubleshooting section to capture errors with installing applications to a Kubernetes cluster"

Closes #59498

See merge request gitlab-org/gitlab-ce!26639
 2019-04-03 09:01:45 +00:00
Alexander Strachan ecae2c4892 Resolve "Add troubleshooting section to capture errors with installing applications to a Kubernetes cluster" 2019-04-03 09:01:44 +00:00
Grzegorz Bizon 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
Sean McGivern 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
Filipa Lacerda 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
Ezekiel Kigbo 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
Rémy Coutable 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
Filipa Lacerda 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
Filipa Lacerda 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
Tim Zallmann 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
Tim Zallmann 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
Phil Hughes 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
Evan Read 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
Shinya Maeda 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
Evan Read 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
Cody Mize 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
Evan Read 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
Sanad Liaquat 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
Nick Thomas d17cce6aed
Only execute system hooks once when pushing tags 2019-04-03 01:53:38 +01:00
Mike Greiling 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
Clement Ho 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
William Chia 0e9b478707 remove html tag 2019-04-02 21:08:25 +00:00
Douglas Barbosa Alexandre 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
Clement Ho 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
Donald Cook 2378dde2e2 Remove non-functional add issue button on welcome list 2019-04-02 20:23:23 +00:00
Robert Speicher 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
Jan Provaznik 0c45e268a1 Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'" 
This reverts merge request !26569
 2019-04-02 20:05:56 +00:00
Lukas 'Eipi' Eipert f3b81ee6f2 Update dependency @gitlab/svgs to ^1.58.0 2019-04-02 19:26:26 +00:00
Olliver Schinagl 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
Marcia Ramos 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
Marcia Ramos 6fe5d402ea Add screenshots for variables 
- Variables overview
- Variables triggered via manual pipeline
 2019-04-02 17:18:44 +00:00
Kamil Trzciński 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
Imre Farkas ea283bbc6b Remove ignore column for PersonalAccessToken#token 2019-04-02 16:48:55 +00:00
Douglas Barbosa Alexandre 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
Jacopo 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
Lin Jen-Shin 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
Heinrich Lee Yu 0e5dbaf87f Do not show system notes on commits in the MR page 2019-04-02 22:59:43 +08:00