Douwe Maan
50f8366a89
Merge branch 'complexity/rubocop-metrics' into 'master'
...
Enable rubocop metrics
This enables rubocop metrics like CyclomaticComplexity and ABCSize.
Initial threshold values are high, should be probably decreased.
See merge request !1802
2015-12-11 15:06:31 +00:00
Valery Sizov
72b7d1f59d
emoji aliases problem
2015-12-11 13:17:12 +02:00
Douwe Maan
cd97dba2a9
Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'
2015-12-11 10:33:03 +01:00
Corey Hinshaw
d8b3c3274c
AuthHash should not parameterize email user
2015-12-10 18:49:48 -05:00
Dmitriy Zaporozhets
0d65f09ff1
Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu/gitlab-ce
2015-12-10 20:32:31 +01:00
Dmitriy Zaporozhets
b20f677baa
Merge remote-tracking branch 'origin/emoji_edit_disallow'
2015-12-10 19:40:18 +01:00
Zeger-Jan van de Weg
82d2e5c3c5
Merge branch 'master' into copying-file-seen-as-licence
2015-12-10 16:27:26 +01:00
Zeger-Jan van de Weg
5fd280f3d3
Licence also accepted as license file
2015-12-10 16:26:25 +01:00
Douwe Maan
10387f6b8a
Merge branch 'master' into tmp-reference-pipeline-and-caching
...
# Conflicts:
# spec/lib/gitlab/markdown/autolink_filter_spec.rb
# spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
# spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
# spec/lib/gitlab/markdown/cross_project_reference_spec.rb
# spec/lib/gitlab/markdown/emoji_filter_spec.rb
# spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/external_link_filter_spec.rb
# spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/label_reference_filter_spec.rb
# spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
# spec/lib/gitlab/markdown/redactor_filter_spec.rb
# spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
# spec/lib/gitlab/markdown/relative_link_filter_spec.rb
# spec/lib/gitlab/markdown/sanitization_filter_spec.rb
# spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
# spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
# spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
# spec/lib/gitlab/markdown/task_list_filter_spec.rb
# spec/lib/gitlab/markdown/upload_link_filter_spec.rb
# spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
Valery Sizov
e3ee46a13b
Don't allow to edit award emoji comments
2015-12-10 14:39:37 +02:00
Robert Speicher
ba79d1e5b8
Merge branch 'devise_paranoid_mode' into 'master'
...
Enable Devise paranoid mode and ensure the returned message is the same
every time. This will prevent user enumeration (low impact).
Prior to this change a user could type an email in the password reset
field and if the email didn't exist it returned an error. If the email
was valid it returned a message saying the forgot password link had been
emailed. After this change the user will receive a message that if the
email is in our database the reset link will be emailed.
I also changed the throttle mechanism so it still works the same but
now returns the exact same message as above. Previously it would say
'You've already sent a request. Wait a few minutes'. This also allows
user enumeration, although it requires a double-check.
Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624
See merge request !2044
2015-12-10 01:58:11 +00:00
Drew Blessing
f4ec906e90
Use devise paranoid mode and ensure the same message is returned every time
...
Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
2015-12-09 18:40:37 -06:00
Dmitriy Zaporozhets
7a4d468576
Merge remote-tracking branch 'origin/mr-broken'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-12-09 21:06:04 +01:00
Stan Hu
99fd78d6db
Add spec for invalid options in project creation
2015-12-09 09:50:17 -08:00
Dmitriy Zaporozhets
3cf4054854
Merge branch 'split-up-builds' into 'master'
...
Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization
See merge request !2036
2015-12-09 17:08:59 +00:00
Douwe Maan
73c59de062
Merge branch 'master' into split-up-builds
2015-12-09 13:56:26 +01:00
Douwe Maan
3fd1a36d74
Fix spec
2015-12-09 12:00:26 +01:00
Douwe Maan
a2cfb44157
Tag service specs
2015-12-09 11:55:49 +01:00
Douwe Maan
13d6bab177
Tag lib specs
2015-12-09 11:55:42 +01:00
Douwe Maan
1e8d703a85
Tag model specs
2015-12-09 10:50:51 +01:00
Douwe Maan
903151141d
Tweak specs
2015-12-09 09:59:39 +01:00
Douwe Maan
eab086bde1
Merge branch 'master' into merge-if-green
...
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# config/routes.rb
2015-12-09 09:00:25 +01:00
Stan Hu
9dbc768db8
Update annotations
2015-12-08 21:00:01 -08:00
Zeger-Jan van de Weg and Stan Hu
56f25c3e61
Improve text indication visibility on snippets
2015-12-08 14:31:24 -08:00
Douwe Maan
23522a9b34
Fix specs
2015-12-08 23:28:28 +01:00
Douwe Maan
8fb49a4b70
Merge branch 'master' into merge-if-green
...
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
2015-12-08 22:34:03 +01:00
Robert Speicher
bcd89a58e7
Merge branch 'reference-pipeline-and-caching' into 'master'
...
Implement different Markdown rendering pipelines and cache Markdown
Builds on !1090 .
Related to !1014 .
Fixes #2054 .
See merge request !1602
2015-12-08 20:22:23 +00:00
Robert Speicher
ebee5077f2
Make tab target selectors less naive
...
Prior, any of the specified IDs could have been hijacked by a table of
contents header, breaking the tab functionality. For example, a `##
Notes` header would get the id `notes` and prevent the Discussion tab
from being activated.
Closes #3908
2015-12-08 14:47:28 -05:00
Drew Blessing
bf5683f889
Block LDAP user when they are no longer found in the LDAP server
2015-12-08 11:15:30 -06:00
Dmitriy Zaporozhets
54d0ff982b
Merge branch 'build-related-fixes' into 'master'
...
Build related UI fixes
## Before
## After
See merge request !2015
2015-12-08 17:06:11 +00:00
Douwe Maan
f39ff54290
Merge branch 'master' into zj/gitlab-ce-merge-if-green
2015-12-08 16:18:18 +01:00
Douwe Maan
15925290ee
Merge branch 'master' into ui/dashboard-new-issue
2015-12-08 15:22:04 +01:00
Douwe Maan
51ed5225ad
Merge branch 'serve_lfs_object' into 'master'
...
Serve LFS object
Depends on gitlab-org/gitlab_git!57
See merge request !1976
2015-12-08 14:19:52 +00:00
Douwe Maan
ab85d9694d
Fix spec
2015-12-08 14:13:03 +01:00
Marin Jankovski
6245be083d
All for you rubocop.
2015-12-08 14:00:15 +01:00
Douwe Maan
75486f09c4
Merge branch 'master' into zj/gitlab-ce-merge-if-green
2015-12-08 13:43:45 +01:00
Douwe Maan
926c3bef9f
Merge branch 'master' into reference-pipeline-and-caching
2015-12-08 13:40:32 +01:00
Douwe Maan
0c3f70acf4
Add API group projects specs
2015-12-08 13:34:09 +01:00
Marin Jankovski
ea5b462a14
Stub the calls to disk and check what send_file returns.
2015-12-08 13:33:12 +01:00
Marin Jankovski
9bf51ae47d
Fix specs caused by update of gitlab-test repo.
2015-12-08 10:58:15 +01:00
Douwe Maan
f5430e48b4
Merge branch 'rs-validators' into 'master'
...
Add more custom validators
These custom validators allow us to DRY up our models a bit.
See merge request !1944
2015-12-08 08:42:17 +00:00
Grzegorz Bizon
652de0b820
Refactor CI YAML processor's validators
2015-12-08 08:43:09 +01:00
Grzegorz Bizon
7e9109c43b
Move common_mentionable_setup to shared context in specs
2015-12-08 08:43:09 +01:00
Grzegorz Bizon
75c6b29f6b
Add RepositoryPush specs
2015-12-08 08:43:09 +01:00
Douglas Barbosa Alexandre
f7aafd8fc8
Merge branch 'master' into fix-merge-request-that-removes-submodule
2015-12-07 22:41:18 -02:00
Robert Speicher
611912fe68
Store the demodulized reference filter name in data attribute
2015-12-07 19:40:46 -05:00
Dmitriy Zaporozhets
bdb4945dcf
Fix random failing test - delete attachment
...
Make sure we wait for AJAX request to finish before end test and cleanup
database
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-12-07 23:40:17 +01:00
Robert Speicher
9321d382bd
Add custom NamespaceValidator
2015-12-07 16:57:26 -05:00
Robert Speicher
e48391b813
Add custom ColorValidator
2015-12-07 16:57:26 -05:00
Robert Speicher
d5ea93469b
Add custom UrlValidator
2015-12-07 16:57:26 -05:00
Douwe Maan
Valery Sizov
Corey Hinshaw
Dmitriy Zaporozhets
Zeger-Jan van de Weg
Robert Speicher
Drew Blessing
Stan Hu
Robert Speicher
Marin Jankovski
Grzegorz Bizon
Douglas Barbosa Alexandre