Commit Graph
21497 Commits
Author SHA1 Message Date
Robert Speicher 48eccdb2fc Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'
Fix delete notes on merge request diff

Fixes #3971

See merge request !2061
2015-12-11 12:49:55 -05:00
Douwe Maan a2a68858c8 Merge branch 'feature/project_js_from_ee' into 'master'
Aling project js with EE

The MR ports the changes introduced by gitlab-org/gitlab-ee!70 in `project.js.coffee`.  


See merge request !2054
2015-12-11 15:13:26 +00:00
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
Grzegorz Bizon eaecd39726 Merge branch 'fix/award-emoji-alert-width' into 'master'
Fix award-emojis alert flash message

This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996

\cc @vsizov 

See merge request !2065
2015-12-11 13:45:38 +00:00
Grzegorz Bizon cbeb06eb42 Mix url helpers in into RepositoryPush 2015-12-11 13:00:24 +00:00
Grzegorz Bizon ef37041ab6 Update changelog 2015-12-11 13:52:23 +01:00
Grzegorz Bizon d1211e0ada Fix award-emojis alert flash message
This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996
2015-12-11 13:50:14 +01:00
Valery Sizov 2029be038b Merge branch 'emoji_aliases' into 'master'
Emoji aliases problem

Fixes #3850

See merge request !2064
2015-12-11 12:39:56 +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
Valery Sizov 73942b15e7 Merge branch 'rs-update-gitlab_emoji' into 'master'
Bump gitlab_emoji to ~> 0.2.0

A new version of this gem was released October 29th
but was never bumped in GitLab.

See merge request !1994
2015-12-11 07:43:59 +00:00
Stan Hu 74dcbec369 Update CHANGELOG for 7bb8bb85 2015-12-10 21:26:32 -08:00
Stan Hu 7bb8bb8520 Merge branch 'auth_hash_fix' into 'master'
Expand character set of usernames created by Omniauth

When a user is created by Omniauth, Gitlab tries to assign the username based on the information provided in the auth hash. If no nickname is present, it uses the part of the email address before the @. This portion of the email address is run through the `parameterize` method, presumably to convert Unicode characters to ASCII.

`parameterize` strips out a number of characters that are valid in usernames. For example, `john.doe` is a valid Gitlab username, but parameterize will turn this into `john-doe`.

Instead of `parameterize`, this merge request uses `normalize` to convert non-ascii characters. This allows all acceptable characters to be used when creating a username from an email address. 

See merge request !660
2015-12-11 01:54:00 +00:00
Dmitriy Zaporozhets 0d5d1f0e6f Merge branch 'remove_check_icon_from_mr_page' into 'master'
Remove check icon from merged MRs

Now that GitLab CI exposes the status of each MR in the MR page it seems "redundant" to have an extra icon next to the CI statuses.

The "downside" is with people that don't use CI and don't see the statuses, but I don't think that this is that big a change that would miss to anyone.

\cc @dzaporozhets @creamzy 

How it looks now:

![screenshot-gitlab_com_2015-12-10_20-49-53](/uploads/414dcb5131eab2d9518dc77019116c96/screenshot-gitlab_com_2015-12-10_20-49-53.png)


See merge request !2059
2015-12-11 01:43:18 +00:00
Dmitriy Zaporozhets 3a82302fcb Merge branch 'bump-devise-3.5.3' into 'master'
Bump devise to 3.5.3 to fix reset token expiring after account creation

Also fixes an incorrect redirect after login with relative URL root:

Closes https://github.com/gitlabhq/gitlabhq/issues/8228

Closes #2750

See merge request !2056
2015-12-11 01:37:56 +00:00
Douglas Barbosa Alexandre 1a9d6ec71e [ci skip] Update CHANGELOG 2015-12-10 22:30:06 -02:00
Douglas Barbosa Alexandre 1f893022fd Remove note from MR discussion when deleting it in the changes tab 2015-12-10 22:07:25 -02:00
Corey Hinshaw d8b3c3274c AuthHash should not parameterize email user 2015-12-10 18:49:48 -05:00
Stan Hu e2b6a4621b Merge pull request #9850 from davydovanton/doc-fix-typos
Fix typos in all docs
2015-12-10 14:30:24 -08:00
Achilleas Pipinellis 667065700b Merge branch 'user_file_uploads_documentation' into 'master'
Document file upload random uuid security

This documents the current state of file uploads regarding random UUID and security.
Fixes #3569 

Thanks to @DouweM for the language.

cc/ @sytses @JobV @axil Does this look OK?

See merge request !2055
2015-12-10 21:06:53 +00:00
Dmitriy Zaporozhets fb07f706b5 Merge branch 'feature/sidekiq-4' into 'master'
Upgrade Sidekiq to 4.x

Upgraded Sidekiq to 4.x.
More details can be found here: #3065 

After merging this MR, we will require Redis 2.8+.

@stanhu have made a MR !1888 to reflect needed changes on our documentation.

See merge request !2057
2015-12-10 20:38:56 +00:00
Stan Hu 7f1b60cc66 Bump devise to 3.5.3 to fix reset token expiring after account creation
Also fixes an incorrect redirect after login with relative URL root:

Closes https://github.com/gitlabhq/gitlabhq/issues/8228

Closes #2750
2015-12-10 11:37:37 -08: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
Robert Speicher 3f4715322e Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master'
Fix editing notes on a merge request diff

Fixes #3910

See merge request !2041
2015-12-10 19:22:53 +00:00
Gabriel Mazetto 3e5b24d46a Upgraded Sidekiq to 4.x 2015-12-10 17:18:03 -02:00
Achilleas Pipinellis cdda827577 Remove check icon from merged requests
Now that GitLab CI exposes the status of each MR
in the MR page it seems "redundant" to have an
extra icon next to the CI statuses.
2015-12-10 20:45:54 +02:00
Dmitriy Zaporozhets b20f677baa Merge remote-tracking branch 'origin/emoji_edit_disallow' 2015-12-10 19:40:18 +01:00
Douglas Barbosa Alexandre 9d6e5f0a28 Make selectors more specific when scroll to element 2015-12-10 15:42:00 -02:00
Robert Speicher 746320cea7 Merge branch 'add-changelog-items' into 'master'
Add missing changelog items

Closes #3973

[ci skip]

See merge request !2053
2015-12-10 17:03:01 +00:00
Drew Blessing 63a1a581e9 Document file upload random uuid security 2015-12-10 10:24:08 -06:00
Douglas Barbosa Alexandre 67913670dc Make selectors more specific when setting the tab content
Reason: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2023
2015-12-10 13:50:31 -02:00
Douglas Barbosa Alexandre 0c54c9a8a3 USe innerHtml to avoid slow performance on a MR with very large diff 2015-12-10 13:42:10 -02:00
Zeger-Jan van de Weg a2798e8d06 Target right release 2015-12-10 16:29:25 +01:00
Borja Aparicio 01cafa1d90 Aling project js with EE 2015-12-10 16:27:34 +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 57af1231f2 Add missing changelog items 2015-12-10 15:46:29 +01:00
Douwe Maan 4e5897f51e Merge branch 'tmp-reference-pipeline-and-caching' into 'master'
[Second try] Implement different Markdown rendering pipelines and cache Markdown

!1602 already got merged in bcd89a58e7, but it would appear the merge commit disappeared because of #3816 (or some other reason).

cc @rspeicher 

See merge request !2051
2015-12-10 14:34:12 +00:00
Douwe Maan 3bfedbd25a Merge branch 'rs-snippets-clipboard' 2015-12-10 14:54:47 +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
Kamil Trzciński bdc62d704c Merge branch 'rs-reset-db' into 'master'
Run db:reset before db:create on CI

Should prevent build failures caused by missing migrations, such as
https://gitlab.com/gitlab-org/gitlab-ce/builds/439927

See merge request !2045
2015-12-10 09:50:21 +00: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
Dmitriy Zaporozhets 19837682e0 Merge branch 'ui-fix' into 'master'
Fix list with controls display

Introduced in !2025

## Before

![before](/uploads/969f021f1f97062439cc4e836f29bdf6/before.png)

## After

![after](/uploads/defd46ddbd8392625848dfd3ac067869/after.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !2048
2015-12-10 01:17:34 +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 0549b5e8ee Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message
Fix inconsistency with no ssh key message
2015-12-10 01:28:53 +01:00
Dmitriy Zaporozhets ab8ab9b10c Fix list with controls display
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-10 01:24:10 +01:00
Robert Speicher 8dc689cf5a Merge remote-tracking branch 'dev/master' into 'master' 2015-12-09 18:43:00 -05:00
Robert Speicher e5f4f1d190 Merge branch 'yaml_safe_load' into 'master'
Use YAML.safe_load

See merge request !1941
2015-12-09 23:42:24 +00:00
Dmitriy Zaporozhets 57f7a4db63 Merge branch 'issue_3854' into 'master'
Downcase commit author email for matching with users

Closes #3854 

See merge request !1992
2015-12-09 21:27:47 +00:00