4edfad9678
Enable Layout/TrailingWhitespace cop and auto-correct offenses
2017-08-15 13:44:37 -04:00
885314b48b
Merge branch 'user-edit-files-spec-fix' into 'master'
...
Wait for requests to finish before running the ace JS
Closes #36191
See merge request !13405
2017-08-14 10:32:00 +00:00
7438eececa
Merge branch 'rs-rspec-hook-argument-cop' into 'master'
...
Enable the RSpec/HookArgument cop and auto-correct offenses
See merge request !13484
2017-08-11 12:20:16 +00:00
e66dcf4944
Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb
...
It closes #36308
2017-08-11 08:12:45 +02:00
c8b802471b
Enable the RSpec/HookArgument cop and auto-correct offenses
2017-08-10 19:29:42 -04:00
3ba782d5de
Wait for requests to finish before running the ace JS
...
Closes #36191
2017-08-09 08:54:32 +01:00
4c8b666893
Merge branch 'zj-project-templates' into 'master'
...
Allow projects to be started from a template
Closes #32420
See merge request !13108
2017-08-07 19:24:14 +00:00
ae5003a35e
Fix html structure
...
Removes test for removed behavior
2017-08-07 18:51:30 +01:00
036ee515d4
Port form back to use form_tag
2017-08-07 19:36:06 +02:00
f8d34ab5ab
Merge branch 'wiki_title' into 'master'
...
add feature rename wiki title
Closes #27800
See merge request !10069
2017-08-07 16:37:44 +00:00
aae947cb1c
Fixes race condition in project uploads
...
Originally picked as: 3fc0dbcbeb
2017-08-07 14:31:45 +02:00
848097b57b
Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master'
...
Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`"
Closes #32790
See merge request !13286
2017-08-04 21:22:41 +00:00
17342953dd
Merge branch '34060-simplified-general-project-settings' into 'master'
...
34060 Simply general project settings to use expanded panels
Closes #34060
See merge request !12620
2017-08-04 18:56:49 +00:00
73146801e6
Fix spec
2017-08-04 20:22:44 +09:00
0c75e23fab
fix
2017-08-04 18:14:48 +09:00
29be4e0f58
Allow wiki pages to be renamed in the UI
2017-08-03 07:38:11 +07:00
72a7b30c9f
Change all `:empty_project` to `:project`
2017-08-02 17:47:31 -04:00
9513bd18c4
Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01 14:51:52 -04:00
fb06a4d8fe
Rename more path_with_namespace -> full_path or disk_path
2017-08-01 07:28:13 +02:00
abb878326c
Rename many path_with_namespace -> full_path
2017-08-01 07:26:58 +02:00
8aaaefa5f6
Fix spec/features/projects/branches_spec
...
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666
2017-07-28 12:52:40 -04:00
6ec561a2f7
fixed up specs
2017-07-28 15:29:13 +01:00
f8e5941d37
trying to fix tests
2017-07-28 15:29:13 +01:00
d7b8b38db7
try and fix some tests
2017-07-28 15:29:13 +01:00
8626cdc3b3
Merge branch 'rs-empty_project-features' into 'master'
...
Use `:empty_project` where possible in feature specs
See merge request !13118
2017-07-28 10:00:05 +00:00
fa4d08ed81
Merge branch '32483-jira-error' into 'master'
...
Display specific error message when JIRA test fails
Closes #32483
See merge request !13100
2017-07-28 07:21:04 +00:00
64131f04e1
Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'
...
Prevent concurrent editing wiki
Closes #1827
See merge request !9707
2017-07-27 19:29:25 +00:00
1a0064dceb
Use `empty_project` where possible in spec/features/projects
2017-07-27 13:12:16 -04:00
7e113b6824
Remove superfluous type defs in specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
2850efcdd5
Merge branch '35191-prioritized-labels-for-non-member' into 'master'
...
Remove help message about prioritized labels for non-members
Closes #35191
See merge request !12912
2017-07-27 10:06:26 +00:00
2e483ca9e3
Merge branch 'rc/fix-tests-factories' into 'master'
...
Fix the :project factory by not copying the test repo twice
See merge request !13123
2017-07-27 08:55:53 +00:00
05e152fa7f
Fix the :project factory by not copying the test repo twice
...
Also, fixing some calls to the :project factory with the :test_repo
trait since this trait is already included in the :project factory.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 09:58:06 +02:00
69129f11df
Remove help message about prioritized labels for non-members
2017-07-27 15:27:16 +09:00
aa2b3ff1e4
Display specific error message when JIRA test fails
2017-07-27 07:51:36 +02:00
396b8f91ec
Fix saving diffs that are not valid UTF-8
...
Previously, we used Psych, which would:
1. Check if a string was encoded as binary, and not ASCII-compatible.
2. Add the !binary tag in that case.
3. Convert to base64.
We need to do the same thing, using a new column in place of the tag.
2017-07-26 15:34:57 +01:00
5de3ec64da
Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'
...
Handle errors while a project is being deleted asynchronously.
Closes #29289
See merge request !11088
2017-07-26 12:49:54 +00:00
b5bdc55d23
Move exception handling to execute
2017-07-26 12:47:50 +01:00
a7d49c3927
Remove unnecessary code
2017-07-26 19:53:33 +09:00
1c57299400
Remove project_key from the Jira configuration
2017-07-25 17:25:41 +02:00
7bee7b848a
Support both internal and external issue trackers
2017-07-24 08:13:43 +02:00
2fa22a0729
Associate Issues tab only with internal issues tracker
2017-07-24 08:10:14 +02:00
9b25bbc45d
Merge branch 'master' into 1827-prevent-concurrent-editing-wiki
...
Conflicts:
app/controllers/projects/wikis_controller.rb
app/views/projects/wikis/edit.html.haml
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
2017-07-23 21:26:02 +09:00
d950e4d937
Merge branch 'zj-pipeline-badge-improvements' into 'master'
...
Pipeline badge improvements
Closes #15582 and #20961
See merge request !12966
2017-07-22 05:36:02 +00:00
f95b605cc1
Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' into 'master'
...
Recommend V4 API usage on chat slash command integrations
Closes #28975
See merge request !12954
2017-07-21 13:54:52 +00:00
0d3b8fad97
Port spinach tests to rspec feature specs
...
Logic is the same, just now ported, while this feature was being
improved anyway in this branch.
Resolves #20961
2017-07-21 14:43:27 +02:00
cfba167694
Merge branch 'fix/sm/32790-pipeline_schedules-pages-throwing-error-500' into 'master'
...
Follow-up from "Resolve "pipeline_schedules pages throwing error 500""
Closes #35345 , #32790 , and #34652
See merge request !12983
2017-07-21 09:49:47 +00:00
8877f2e8c1
Reword success to passing for pipeline badges
2017-07-21 10:22:11 +02:00
2086483b24
Rename build to pipeline for status badges
...
First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582 . This
commit is renaming files and classes from build to pipeline. Also
wording is editted to pipeline. Given `pipeline` had more characters
than `build`, I've made the field a bit wider. The width now matchers
the one for the coverage badge, so they look nice when in a table
format, or in a list.
As soon as this commit is merged to master, and released, the build.svg
is deprecated, meaning that all users which already placed a badge
should update it. However, to make sure it keeps working tests are added
for this case.
2017-07-21 10:22:09 +02:00
e0ab5618a0
Wrong data type when testing webhooks
2017-07-20 15:12:06 +00:00
3491b19a4e
Add specs for ProjectDestroyWorker
2017-07-20 09:59:56 +01:00
Robert Speicher
Tim Zallmann
Rémy Coutable
Mehdi Lahmam
Phil Hughes
Sean McGivern
Filipa Lacerda
Z.J. van de Weg
Robert Speicher
Tiago Botelho
Mike Greiling
Shinya Maeda
wendy0402
Gabriel Mazetto
tauriedavis
Keifer Furzland
Takuya Noguchi
Jarka Kadlecova
Sean McGivern
Hiroyuki Sato
Grzegorz Bizon
Alexander Randa