Commit Graph
11783 Commits
Author SHA1 Message Date
Jacob Vosmaer b2a634c352 Avoid trailing 'charset=' garbage 2016-02-01 12:01:13 +01:00
Jacob Vosmaer 2679ec4066 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse 2016-02-01 11:33:36 +01:00
Jacob Vosmaer 02afa6793c Use only one header to send git blobs 2016-02-01 11:33:22 +01:00
Robert Speicher 3986f4f083 Make "Two-factor" casing consistent throughout the application 2016-01-31 20:34:51 -05:00
Robert Speicher 5d4f8012f6 Merge branch 'rename-inline-diff' into 'master'
Mark inline difference between old and new paths when a file is renamed

See merge request !2652
2016-01-31 03:04:33 +00:00
Douwe Maan d240876aba Merge branch 'rs-issue-12706' into 'master'
Increase the minimum length for commit SHA matching to 7

This is the git default and will help to prevent false positive matches.

Closes #12706

See merge request !2655
2016-01-30 12:00:36 +00:00
Douwe Maan 47afe7ae8f Fewer html_safes 2016-01-30 12:54:19 +01:00
Dmitriy Zaporozhets 55c4996b4d Merge branch 'cache-broadcast-message-current' into 'master'
Cache BroadcastMessage.current. Fixes #12770



See merge request !2633
2016-01-30 11:31:15 +00:00
Dmitriy Zaporozhets f862b4ae0f Merge remote-tracking branch 'origin/background-delete-process' 2016-01-30 12:14:48 +01:00
Douwe Maan 3d61cf9f1b Merge branch 'warn-admin-oauth' into 'master'
Warn admin of granting admin rights during OAuth

Fixes #3951

Warning style the same as the warning a user sees on a archived project.



![Screenshot_from_2016-01-25_20-06-33](/uploads/42e6a218b963311fd20c0b7c87c8cf4f/Screenshot_from_2016-01-25_20-06-33.png)


See merge request !2601
2016-01-30 10:03:40 +00:00
Robert Speicher d97742570f Increase the minimum length for commit SHA matching to 7
This is the git default and will help to prevent false positive matches.

Closes #12706
2016-01-29 19:52:29 -05:00
Josh Frye a6d6cfaf92 Change ttl to 1 minute 2016-01-29 13:39:33 -05:00
Josh Frye d8a292d907 Cache BroadcastMessage.current for 5 minutes. Fixes #12770 2016-01-29 13:39:33 -05:00
Douwe Maan 677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
Douglas Barbosa Alexandre aa30088f6e Fix old version warning when viewing wiki latest version via version_id 2016-01-29 14:17:00 -02:00
Jacob Schatz b4b41b4ca6 Merge branch 'focus-emoji-search-field' into 'master'
Auto-focus emoji award search field

![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif)

Closes #12621 

cc. @jschatz1 

See merge request !2650
2016-01-29 15:27:24 +00:00
Josh Frye 91b9cbff8d First pass at deleting projects in the background. 2016-01-29 09:14:16 -05:00
Dmitriy Zaporozhets 227728712e Merge branch 'note-background-job' into 'master'
Background process note logic for #3948

Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist.

```
without background processing
  Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms)
  Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms)
  Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms)

with background processing
  Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms)
  Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms)
  Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms)
```

As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount.

@dzaporozhets @yorickpeterse I would love some input on this.

See merge request !2631
2016-01-29 13:51:34 +00:00
Dmitriy Zaporozhets e221990eba Merge branch 'rs-remove-ip-blocking' into 'master'
Partially revert "Add IP check against DNSBLs at account sign-up"

This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.

See merge request !2643
2016-01-29 13:31:33 +00:00
Phil Hughes 1b97872793 Auto-focus emoji award search field
Closes #12621
2016-01-29 12:15:58 +00:00
Marin Jankovski 9d0065f054 Merge branch 'hotfix/ruby-21-broken-update' into 'master'
fix syntax error on 2.1 and rubocop on 2.2

Background:

Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 

We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.

Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 

Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801

See merge request !2637
2016-01-29 08:12:18 +00:00
Robert Speicher ca05054ea2 Partially revert "Add IP check against DNSBLs at account sign-up"
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
2016-01-28 16:28:19 -05:00
Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master'
Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632
2016-01-28 21:08:41 +00:00
Robert Speicher 0e79b5f396 Merge branch 'highlight-blame' into 'master'
Fix highlighting in blame view.

See merge request !2630
2016-01-28 20:30:21 +00:00
Robert Speicher 789e048352 Merge branch 'rs-ldap-user' into 'master'
Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641
2016-01-28 19:09:52 +00:00
Robert Speicher 1e666ce695 Backport LDAP user assignment changes from EE
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
2016-01-28 13:31:48 -05:00
Josh Frye f9218898ec [WIP] Background process note logic for #3948 2016-01-28 13:04:42 -05:00
James Lopez 69c4e0a119 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-broken-update 2016-01-28 18:14:28 +01:00
Jacob Vosmaer 368b855d88 No need for base64 anymore 2016-01-28 18:08:37 +01:00
Jacob Vosmaer 26d97ac5e1 Send more raw blob data with workhorse 2016-01-28 18:04:46 +01:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master'
Show list of forks for a given Project

Closes #2406

See merge request !2376
2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets 3f6bb7bc86 Merge branch 'issue_5546' into 'master'
Save list sort in a cookie

Closes #5546 

See merge request !2537
2016-01-28 16:21:04 +00:00
Douwe Maan b7ec476205 Merge branch 'master' into mr-merge-base 2016-01-28 15:12:24 +01:00
Jacob Schatz 695fb209b7 Merge branch 'sort-text-removed-from-sort-dropdown' into 'master'
Removed sorted text from dropdowns

![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png)

Closes #12796 

cc @creamzy @jschatz1 

See merge request !2635
2016-01-28 14:11:05 +00:00
Douwe Maan 30b0d06e9f Fix specs 2016-01-28 15:10:48 +01:00
Jacob Vosmaer 9109619ee6 Use less memory while counting lines 2016-01-28 15:02:44 +01:00
Douwe Maan 590e237d55 Merge branch 'master' into highlight-blame 2016-01-28 14:49:34 +01:00
Douwe Maan b636f83e59 Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
Dmitriy Zaporozhets 9bf47f06ab Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master'
Makes ol margin big enough for 3 digits.

Fixes #7960 

![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png)


See merge request !2608
2016-01-28 13:07:26 +00:00
Dmitriy Zaporozhets 6748520de6 Merge branch 'feature/jschatz1/instant-issuable-history' into 'master'
Adds feature: Ajax Close/Open updates discussion automatically

Triggers jQuery event <br/>
Fixes #5544

See merge request !2610
2016-01-28 13:05:50 +00:00
James Lopez 902baa2e1c trick rubocop and temporarily add ruby 2.1 images for any branch 2016-01-28 11:41:58 +01:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns
Closes #12796
2016-01-28 09:06:20 +00:00
Douwe Maan f025f80d5c Merge branch 'update-ruby-2.2.4' into 'master'
Update Ruby version to 2.2.4 (latest previous stable) and update docs

Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. 

Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340

See merge request !2534
2016-01-27 21:39:08 +00:00
Robert Speicher bba7e786a6 Merge branch 'events-performance' into 'master'
Improve performance of retrieving last update times for events

See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415

See merge request !2613
2016-01-27 21:20:16 +00:00
Robert Speicher 614025da38 Merge branch 'rs-skip-2fa-on-signout' into 'master'
Skip the 2FA requirement during logout

See merge request !2581
2016-01-27 21:17:31 +00:00
Robert Speicher 27893b972d Merge branch 'diff-colors' into 'master'
Increase contrast between highlighted code comments and inline diff marker.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737.

It was especially bad in Monokai, better now.

See merge request !2629
2016-01-27 20:59:27 +00:00
Rubén Dávila 0ee875f961 Align filter dropdown. 2016-01-27 15:21:27 -05:00
Robert Speicher 56538f9cc1 Merge branch 'fix/unexistent-group-500' into 'master'
Return a 404 instead of a 500 when accessing a non-existent group

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600

See merge request !2614
2016-01-27 20:19:35 +00:00
Dmitriy Zaporozhets 4dea268215 Merge branch 'rs-require-jquery-ui' into 'master'
Limit jquery-ui requires to what we actually use



See merge request !2274
2016-01-27 19:14:20 +00:00
Dmitriy Zaporozhets 7e6da7b91a Merge branch 'rs-2fa-requirement-wording' into 'master'
Update wording for 2FA requirement notice



See merge request !2582
2016-01-27 19:04:44 +00:00