08083f43cb
Merge branch 'refactor/move-mr-widget-ready-to-merge-vue-component' into 'master'
...
Move ReadyToMerge vue component
See merge request gitlab-org/gitlab-ce!17545
2018-04-16 18:31:44 +00:00
41636097a5
Merge branch 'rs-database-mr-template' into 'master'
...
`package-qa` was renamed to `package-and-qa`
See merge request gitlab-org/gitlab-ce!18406
2018-04-16 18:22:45 +00:00
d5401cabea
Merge branch 'fl-reduce-test-tech-debt' into 'master'
...
Adds helpers to remove withespace and linebreaks
See merge request gitlab-org/gitlab-ce!18378
2018-04-16 18:01:10 +00:00
1cc633c8ec
Adds helpers to remove withespace and linebreaks
2018-04-16 18:01:09 +00:00
32bbe82ef8
`package-qa` was renamed to `package-and-qa`
...
[ci skip]
2018-04-16 12:45:24 -05:00
d103a567d6
Merge branch 'dz-update-permissions' into 'master'
...
Update permissions.md with guidance for developing new features
See merge request gitlab-org/gitlab-ce!18344
2018-04-16 17:03:31 +00:00
18097c1d4d
Merge branch 'fix_container_scanning_in_vendored_gitlab_ci_yml_for_auto_devops' into 'master'
...
Fix container scanning in vendored GitLab CI configuration for Auto Devops
See merge request gitlab-org/gitlab-ce!18374
2018-04-16 16:34:43 +00:00
07905c6916
Fix container scanning in vendored GitLab CI configuration for Auto Devops
2018-04-16 16:34:43 +00:00
671a204ccc
Merge branch '45397-update-faraday_middleware-to-0.12.2' into 'master'
...
Update faraday_middleware to 0.12.2
Closes #45397
See merge request gitlab-org/gitlab-ce!18397
2018-04-16 16:20:36 +00:00
e5dbe4ca60
link to product handbook piece on permissions
2018-04-16 15:23:34 +00:00
ddd7a81d4f
Merge branch '45269-double-checked-internal-ids' into 'master'
...
Double-checked internal ID generation for transition phase
Closes #45269
See merge request gitlab-org/gitlab-ce!18392
2018-04-16 15:22:40 +00:00
5d6fb753ef
Merge branch 'fixing-url' into 'master'
...
corrected git cheat sheet url
See merge request gitlab-org/gitlab-ce!18385
2018-04-16 14:51:53 +00:00
6680b6beb4
Merge branch 'sh-bump-parser-gem' into 'master'
...
Bump parser gem to 2.5.1.0 to remove warning in rspec
See merge request gitlab-org/gitlab-ce!18384
2018-04-16 14:51:14 +00:00
cf7a3da4cc
Merge branch 'fix-doc-link' into 'master'
...
Use direct link rather than redirect for the 2F2 documentation page
See merge request gitlab-org/gitlab-ce!18273
2018-04-16 14:19:13 +00:00
87bbfa4d8b
Merge branch 'update-todos-docs' into 'master'
...
Added missing actions in todos docs
Closes #44803
See merge request gitlab-org/gitlab-ce!18247
2018-04-16 14:07:20 +00:00
af14cdc877
Merge branch 'docs/gb/add-support-note-to-variables-policy-docs' into 'master'
...
Add note about support of variables policy to docs
Closes #45301
See merge request gitlab-org/gitlab-ce!18387
2018-04-16 13:59:32 +00:00
4d3c75ab74
Update faraday_middlewar to 0.12.2
2018-04-16 21:49:35 +09:00
25cb70ba60
Merge branch 'ash.mckenzie/include-sha-with-version' into 'master'
...
Include git SHA with GitLab version on Admin Dashboard
See merge request gitlab-org/gitlab-ce!18331
2018-04-16 12:10:24 +00:00
14acbf2455
Double-check next value for internal ids.
...
This is useful for a transition period to migrate away from
`NoninternalAtomicId`. In a situation where both the old and new code to
generate a iid value is run at the same time (for example, during a
deploy different nodes may serve both versions), this will lead to
problems regarding the correct `last_value`. That is, what we track in
`InternalId` may get out of sync with the maximum iid present for
issues.
With this change, we double-check that and correct the `last_value` with
the maximum iid found in issues if necessary.
This is subject to be removed with the 10.8 release and tracked over
here: https://gitlab.com/gitlab-org/gitlab-ce/issues/45389
Closes #45269 .
2018-04-16 13:59:20 +02:00
4fcee58636
Merge branch 'ab-45247-project-lookups-validation' into 'master'
...
Validate project path prior to hitting the database.
Closes #45247
See merge request gitlab-org/gitlab-ce!18322
2018-04-16 11:18:39 +00:00
218b55dec9
Merge branch '40487-stop-polling' into 'master'
...
Resolve "Pipeline view stages showing incorrectly"
Closes #40487
See merge request gitlab-org/gitlab-ce!18254
2018-04-16 11:11:26 +00:00
cee3df6c24
Merge branch '8088_embedded_snippets_support' into 'master'
...
Embedded Snippets Support
Closes #8088
See merge request gitlab-org/gitlab-ce!15695
2018-04-16 10:56:16 +00:00
4ed152e4ba
Merge branch '44294-skeleton-lines' into 'master'
...
Resolve "skeleton placeholder on diff has white background"
Closes #44294
See merge request gitlab-org/gitlab-ce!17792
2018-04-16 09:52:36 +00:00
0e1c5ed399
Resolve "skeleton placeholder on diff has white background"
2018-04-16 09:52:33 +00:00
d182f6d160
Merge branch 'deprecation-warning-for-dynamic-milestones' into 'master'
...
Deprecation warning for dynamic milestones
Closes #42336
See merge request gitlab-org/gitlab-ce!17505
2018-04-16 09:33:15 +00:00
ed9971081c
Merge branch 'custom-issue-tracker-docs' into 'master'
...
Update custom issue tracker docs
See merge request gitlab-org/gitlab-ce!18375
2018-04-16 09:28:57 +00:00
bcaba662e5
Merge branch '45278-failing-current_settings_spec-rb-on-master-when-env-in_memory_application_settings-is-true-returns-an-in-memory-applicationsetting-object' into 'master'
...
Resolve "Failing current_settings_spec.rb on master (when ENV["IN_MEMORY_APPLICATION_SETTINGS"] is true returns an in-memory ApplicationSetting object)"
Closes #45278
See merge request gitlab-org/gitlab-ce!18388
2018-04-16 09:17:29 +00:00
551f146e8f
Merge branch 'fix-shortcuts-dashboard-navigation-error' into 'master'
...
Fix "Uncaught TypeError: Cannot read property 'getAttribute' of null"
See merge request gitlab-org/gitlab-ce!18358
2018-04-16 09:05:30 +00:00
62b0563615
Merge branch 'blackst0ne-replace-spinach-project-commits-comments.feature' into 'master'
...
Replace the `project/commits/comments.feature` spinach test with an rspec analog
See merge request gitlab-org/gitlab-ce!18356
2018-04-16 08:53:27 +00:00
36d6cc86fd
Replace the `project/commits/comments.feature` spinach test with an rspec analog
2018-04-16 08:53:27 +00:00
4dbc309b9e
Set ENV['IN_MEMORY_APPLICATION_SETTINGS'] to 'true in spec/db/production/settings_spec.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-16 10:48:53 +02:00
c3e26860be
Merge branch 'osw-backport-gl-subdomain-method' into 'master'
...
Backport GitLab domain helper methods
See merge request gitlab-org/gitlab-ce!18376
2018-04-16 08:22:55 +00:00
37c8c97c22
Merge branch 'dz-fix-admin-import-sources' into 'master'
...
Don't reset application settings checkboxes when save another section
Closes #45343
See merge request gitlab-org/gitlab-ce!18366
2018-04-16 08:19:59 +00:00
9c2b9c987d
Update docs on `.gitlab-ci.yml` and variables policy
2018-04-16 07:40:01 +00:00
c50b077be2
Add note about support of variables policy to docs
2018-04-16 09:30:13 +02:00
a6a1b7310f
Merge branch '44582-clear-pipeline-status-cache' into 'master'
...
Allow `rake cache:clear` clearing pipeline status cache
Closes #44582
See merge request gitlab-org/gitlab-ce!18257
2018-04-16 07:27:09 +00:00
3f66736fa9
Revert and fix
2018-04-15 16:35:32 +01:00
9084418774
corrected git cheat sheet url
...
Previous one returned HTTP 404. It was discussed in http://gitlab.com/gitlab-com/marketing/general/issues/1966
that it is preffered to use /press based git cheat sheet pdf because it
is opened in browser's pdf viewer by default rather than downloaded.
2018-04-15 13:16:00 +03:00
0089a452a6
Bump parser gem to 2.5.1.0 to remove warning in rspec
2018-04-14 15:56:55 -07:00
ef3fb77f0f
Merge branch 'fix-rspec-console-output' into 'master'
...
Display relevant browser console output when an RSpec test fails.
See merge request gitlab-org/gitlab-ce!18355
2018-04-14 21:48:23 +00:00
b6c6adfa51
Update invalid test application_settings_controller_spec.rb
...
There are 2 problems with this spec:
1. It checks for default visiblity level however there is not code in
controller to handle such default. Same check can be performed on model
directly.
2. It passes empty application_setting hash while controller requires
application_setting not to be empty by using `require` with `permit`
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-04-14 00:04:55 +03:00
160f1fd225
Merge branch 'docs-use_docker_stable_in_examples' into 'master'
...
Use stable docker image instead of latest
See merge request gitlab-org/gitlab-ce!18373
2018-04-13 19:43:09 +00:00
b964b43e11
Use stable docker image instead of latest
2018-04-13 19:43:09 +00:00
3219cb293d
Merge branch 'svg-1.18' into 'master'
...
Update gitlab-svgs to 1.18.0
See merge request gitlab-org/gitlab-ce!18369
2018-04-13 19:14:26 +00:00
c61f8805f4
Merge branch '45353-raw-html-is-being-shown-on-the-mr-page-from-performance-widget' into 'master'
...
Resolve "Raw HTML is being shown on the MR page from Performance widget"
Closes #45353
See merge request gitlab-org/gitlab-ce!18370
2018-04-13 19:04:32 +00:00
cac2ed25d0
Handle cancelled request
...
[ci skip] Adds specs
Adds specs
2018-04-13 18:57:13 +01:00
0bc8440d4e
Stop polling and fetch the table
2018-04-13 18:57:12 +01:00
6c76e81bbf
[ci skip] Updates table when stage is clicked
2018-04-13 18:57:08 +01:00
2c8d4f1a45
Backport GitLab domain helper methods
2018-04-13 14:52:33 -03:00
3283386a1e
use jquery object in togglePopover
2018-04-13 18:44:58 +01:00
Mike Greiling
Yorick Peterse
Clement Ho
Filipa Lacerda
Robert Speicher
Dmitriy Zaporozhets
Robert Speicher
Gilbert Roulot
Sean McGivern
🚄 Job van der Voort 🚀
Rémy Coutable
Grzegorz Bizon
Takuya Noguchi
Nick Thomas
Andreas Brandl
Phil Hughes
Simon Knox
blackst0ne
Douwe Maan
Grzegorz Bizon
Luke Bennett
Vasyl Vavrychuk
Stan Hu
Philippe Lafoucrière
Oswaldo Ferreira