7ea12d8067
Merge branch 'mrchrisw-fix-slack-notify' into 'master'
...
Fix notify_only_default_branch check for Slack service
See merge request !11154
2017-05-09 08:18:48 +00:00
0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
11ff9fc6a9
Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into 'master'
...
Use regex to skip unnecessary reference processing in ProcessCommitWorker
Closes #28359
See merge request !10867
2017-05-08 12:54:23 +00:00
52c8651a6c
Fix notify_only_default_branch check for Slack service
...
The notify_only_default_branch property is using boolean_accessor
this means we need to check it using a question methods.
Also add specs for disabling this option.
2017-05-08 15:55:02 +10:00
9e041f2185
Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master'
...
Generate and handle a gl_repository param to pass around components
Closes #29925
See merge request !10992
2017-05-05 22:08:29 +00:00
aa874a1cd6
Merge branch 'mia_backort' into 'master'
...
Backport of Multiple Assignees feature
See merge request !11089
2017-05-05 19:17:28 +00:00
2404001522
Merge branch 'issue-title-description-realtime' into 'master'
...
Render Description Realtime 🎉
Closes #25049 and #31355
See merge request !10865
2017-05-05 18:47:01 +00:00
ecaa68a709
Merge branch 'balsalmiq-support' into 'master'
...
Initial balsamiq support
See merge request !10564
2017-05-05 18:43:13 +00:00
40f51c8e81
[skip ci] Fix FE conflicts with master
2017-05-05 09:19:58 -05:00
5004579b15
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip]
2017-05-05 16:59:31 +03:00
10c1bf2d77
Merge branch 'prometheus-integration-test-setting-fix' into 'master'
...
Added rescue block for the test method for the prometheus service
Closes #31451
See merge request !10994
2017-05-05 13:50:03 +00:00
645593e5af
Add instant comments support
2017-05-05 10:57:29 +00:00
29519edb55
Cycle analytics specs needed Commit to reference issue
...
The plan stage both measures time taken and lists related commits. We test for commits being listed, so needed to actually mention the issue in them. An alternative would have been adding “allow_any_instance_of(Commit).to receive(:matches_cross_reference_regex?).and_return(true)” but this felt too coupled to implementation.
2017-05-04 20:03:47 +01:00
64e8119577
Improved code styling and added a HTTParty rescue block
2017-05-04 13:56:26 -05:00
63a5d98a7c
Added specs
2017-05-04 13:56:26 -05:00
45e4c66565
Display slash commands outcome when previewing Markdown
...
Remove slash commands from Markdown preview and display their outcome next to
the text field.
Introduce new "explanation" block to our slash commands DSL.
Introduce optional "parse_params" block to slash commands DSL that allows to
process a parameter before it is passed to "explanation" or "command" blocks.
Pass path for previewing Markdown as "data" attribute instead of setting
a variable on "window".
2017-05-04 17:02:25 +02:00
387c4b2c21
Backport of multiple_assignees_feature [ci skip]
2017-05-04 17:11:53 +03:00
4fd8742193
fix failing slash command specs
2017-05-03 17:09:30 -06:00
9773b5a3d4
make js true
2017-05-03 14:51:28 -06:00
c45341c816
Generate and handle a gl_repository param to pass around components
...
This new param allows us to share project information between components
that don't share or don't have access to the same filesystem
mountpoints, for example between Gitaly and Rails or between Rails and
Gitlab-Shell hooks. The previous parameters are still supported, but if
found, gl_repository is prefered. The old parameters should be deprecated
once all components support the new format.
2017-05-03 17:37:30 -03:00
c1e2da9293
Merge branch 'dm-blob-external-storage' into 'master'
...
Refactor Blob support of external storage in preparation of job artifact blobs
See merge request !11048
2017-05-03 19:54:30 +00:00
720cc14a75
Refactor Blob support of external storage in preparation of job artifact blobs
2017-05-03 10:20:05 -05:00
c45e11f179
Merge branch 'async-milestone-tabs' into 'master'
...
Load milestone tabs asynchronously
See merge request !10919
2017-05-03 15:15:20 +00:00
2174e37845
Include missing project attributes to Import/Export
2017-05-03 10:12:32 +00:00
6201f4c2b5
Merge branch '29836-try-waiting-for-ajax-in-addition-to-requests' into 'master'
...
Wait for AJAX requests at the JS level in addition to wait for requests at the middleware level
Closes #29836
See merge request !10688
2017-05-03 09:27:03 +00:00
fa0c944ede
Merge branch '30272-bvl-reject-more-namespaces' into 'master'
...
Reject more reserved paths
Closes #30272
See merge request !10413
2017-05-02 17:42:23 +00:00
ef7001c9c6
Merge branch 'master' into 'balsalmiq-support'
...
# Conflicts:
# spec/features/projects/commit/cherry_pick_spec.rb
# spec/features/projects/environments/environment_spec.rb
2017-05-02 09:11:55 +00:00
54beb93ac3
Merge branch 'pdflab-in-repo' into 'master'
...
Move PDFLab assets into repo
See merge request !10642
2017-05-02 07:35:49 +00:00
dd9f848653
handle tasks and fix some specs
2017-05-01 18:59:32 -06:00
99a03fd6e9
Move ReservedPathsMigration into V1 namespace
2017-05-01 11:14:24 +02:00
27f54bebb2
Use objects for renaming namespaces and projects
2017-05-01 11:14:24 +02:00
9f3985c613
Move PDFLab into GitLab
2017-04-28 12:52:36 -04:00
cde3760bb4
Merge branch 'master' into balsalmiq-support
2017-04-28 11:32:40 +01:00
471888d60e
Moved sort endpoints into data attributes
2017-04-28 11:08:18 +01:00
73ac7b2dd6
Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"
2017-04-28 09:38:32 +00:00
964e7d206b
Add specs
2017-04-27 12:23:26 -05:00
c3633db617
Merge branch 'master' into 'balsalmiq-support'
...
# Conflicts:
# config/webpack.config.js
2017-04-26 11:26:10 +00:00
480fcb5533
Added controller specs
2017-04-26 12:23:29 +01:00
60a5273d7d
Wait for AJAX requests at the JS level in addition to wait for requests at the middleware level
...
Hopefully, this can solve transient failures such as
https://gitlab.com/gitlab-org/gitlab-ce/issues/29836 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-26 12:08:53 +02:00
a9a1f7a61a
Merge branch 'gitaly-testing-toml' into 'master'
...
Gitaly testing toml
Closes gitaly#182
See merge request !10605
2017-04-25 08:21:06 +00:00
640e8093d4
Merge branch 'notebooklab-in-repo' into 'master'
...
Moved NotebookLab assets into repo
See merge request !10630
2017-04-24 18:17:49 +00:00
3855751d02
Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'
...
See merge request !10567
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-24 18:06:47 +02:00
8e6dabb011
Merge branch 'rs-empty-project-features' into 'master'
...
Use `:empty_project` where possible in top-level feature specs
See merge request !10836
2017-04-24 14:57:31 +00:00
90f7343899
Merge branch 'rs-rename-login_as' into 'master'
...
Except where necessary, use `sign_in` over `login_as` in features
See merge request !10320
2017-04-24 11:21:03 +00:00
133f00bedd
Move records to the ghost user in a transaction.
...
- While deleting a user, some of the user's associated records are moved to the
ghost user so they aren't deleted. The user is blocked before these records
are moved, to prevent the user from creating new records while the migration
is happening, and so preventing a data race.
- Previously, if the migration failed, the user would _remain_ blocked, which is
not the expected behavior. On the other hand, we can't just stick the block +
migration into a transaction, because we want the block to be committed before
the migration starts (for the data race reason mentioned above).
- One solution (implemented in this commit) is to block the user in a parent
transaction, migrate the associated records in a nested sub-transaction, and
then unblock the user in the parent transaction if the sub-transaction fails.
2017-04-24 06:46:10 +00:00
ff76adb547
Unnecessary "include WaitForAjax" and "include ApiHelpers"
...
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
aef345024f
Use `:empty_project` where possible in top-level feature specs
2017-04-20 17:30:55 -04:00
6b298d06b4
Return early from `finished_all_ajax_requests?` when jQuery is undefined
2017-04-19 20:28:32 -04:00
5647d5deaf
Simplify the `javascript_test?` helper
...
Also don't try to run `page.evaluate_script` when we're not in a
JavaScript test.
2017-04-19 20:28:32 -04:00
4ef0c6888b
Remove unused `skip_ci_admin_auth` helper
2017-04-19 17:47:06 -04:00
Sean McGivern
Fatih Acet
Dmitriy Zaporozhets
Chris Wilson
Jacob Schatz
Phil Hughes
Clement Ho
Valery Sizov
Robert Speicher
Kushal Pandya
James Edwards-Jones
Jose Ivan Vargas
Rares Sfirlogea
Regis
Alejandro Rodríguez
Douwe Maan
James Lopez
Douwe Maan
Luke "Jared" Bennett
Bob Van Landuyt
Sam Rose
Dosuken shinya
Rémy Coutable
Timothy Andrew
Jacopo
Robert Speicher