Commit Graph
23408 Commits
Author SHA1 Message Date
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
Achilleas Pipinellis dec2151718 Merge branch 'patch-1' into 'master'
Fixed typo for PRIVATE-TOKEN header

Was PRIVATE_TOKEN but should be PRIVATE-TOKEN.
Underscore vs. kebab-case.

See merge request !2624
2016-01-29 18:02:48 +00:00
Robert Speicher 01439ab9a7 Merge branch 'patch-1' into 'master'
add missing `RAILS_ENV=production` bit to bundle command

[ci skip]

See merge request !2626
2016-01-29 17:35:19 +00:00
Douglas Barbosa Alexandre a8b7ac91b4 Merge branch 'fix-viewing-wiki-page-lastest-version-via-version-id' into 'master'
Fix "old version" warning when viewing wiki page's latest version via version_id in URL

Fixes #12712

See merge request !2627
2016-01-29 17:12:42 +00:00
Drew Blessing 7ede227add Merge branch 'increase_lfs_size_column' into 'master'
Increase LFS objects size column

Fixes #12745 

Increases the `size` column integer limit to an 8-byte integer. This allows for a max value of `9223372036854775807` which is 9,223,372,036 GB. That should do it 😃 

I tested this by first reproducing the error (push a file larger than 2.1 GB). The error was:

```
RangeError (3145728000 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4):
  lib/gitlab/lfs/response.rb:232:in `store_file'
  lib/gitlab/lfs/response.rb:170:in `render_lfs_upload_ok'
  lib/gitlab/lfs/response.rb:51:in `block in render_storage_upload_store_response'
  lib/gitlab/lfs/response.rb:204:in `render_response_to_push'
  lib/gitlab/lfs/response.rb:50:in `render_storage_upload_store_response'
  lib/gitlab/lfs/router.rb:76:in `put_response'
  lib/gitlab/lfs/router.rb:20:in `try_call'
  lib/gitlab/backend/grack_auth.rb:41:in `call'
  lib/gitlab/backend/grack_auth.rb:18:in `call_with_kerberos_support'
  lib/gitlab/backend/grack_auth.rb:8:in `call'
```

Then I ran this migration and pushed the file again. It uploaded successfully.


See merge request !2644
2016-01-29 17:03:15 +00: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
Drew Blessing 873f336ecc Increase LFS objects size column 2016-01-29 08:28:58 -06: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 5a04fc9099 Added tests to emoji search field focus 2016-01-29 12:58:34 +00:00
Phil Hughes 1b97872793 Auto-focus emoji award search field
Closes #12621
2016-01-29 12:15:58 +00:00
Dmitriy Zaporozhets f5860ce646 Merge branch 'rs-transient-capybara-timeout' into 'master'
Prevent transient Capybara timeouts during feature tests

The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.

See merge request !2646
2016-01-29 09:53:04 +00:00
Dmitriy Zaporozhets 74e1add2fc Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master'
Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""

This reverts commit b0145d765b.

See merge request !2642
2016-01-29 09:40:18 +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 bbe0fa91d0 Prevent transient Capybara timeouts during feature tests
The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.
2016-01-28 20:56:49 -05:00
Sytse Sijbrandij 92c04ecbd7 Make changes in config/initializers/1_settings.rb 2016-01-28 17:06:21 -08: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
James Lopez 6e4d36b49d add back master only for ruby 2.1 images 2016-01-28 21:54:45 +01: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
Josh Frye f3d4f2eac7 Fix Rubocop error 2016-01-28 14:44:45 -05:00
Robert Speicher 79123ec998 Revert "Revert "Remove the :coffee and :coffeescript Haml filters""
This reverts commit b0145d765b.
2016-01-28 14:29:09 -05: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 f673401c03 Merge branch 'update_sentry_gem' into 'master'
Update sentry-raven gem.

Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings.

Fixes #12657

See merge request !2636
2016-01-28 18:43:40 +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 c95bc65519 Update tests 2016-01-28 13:04:42 -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
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
Dmitriy Zaporozhets ee8884c68e Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into 'master'
Fix preventing migration from crashing in very specific cases

Closes #12606. Closes #12501.

/cc @yorickpeterse @dbalexandre 

See merge request !2600
2016-01-28 15:20:14 +00:00
Dmitriy Zaporozhets ef42af9a8a Merge branch 'improve-mr-api' into 'master'
Improve consistency and duplication for Merge Request API

* Follow REST for merge request API route
* Remove repeating comments API for MR

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

Fixes #4759 and #11810 

See merge request !2639
2016-01-28 14:50:03 +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
Douwe Maan 7d07091c6c Fix changelog 2016-01-28 14:49:53 +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 dfb8803c1c Improve consistency and duplication for Merge Request API
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-28 14:26:12 +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
Rémy Coutable 55ab92c00b Use ActiveRecord::Base.connection.active? and rescue any exception in connect_to_db?
This ensures that rake tasks that don't need a DB connection can be run
without one.
2016-01-28 12:23:37 +01:00
James Lopez 902baa2e1c trick rubocop and temporarily add ruby 2.1 images for any branch 2016-01-28 11:41:58 +01:00
Rémy Coutable 869b4d7c6a Only create the defaults ApplicationSetting when DB is fully migrated
Return a fake application settings OpenStruct when this is not the case.
Also, use ActiveRecord::Base.connection_pool.active_connection? instead
of ActiveRecord::Base.connection.active? to avoid driver exception.
2016-01-28 11:26:28 +01:00
Marin Jankovski 34a12e8cf9 Update sentry-raven gem. 2016-01-28 10:37:20 +01:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns
Closes #12796
2016-01-28 09:06:20 +00:00
Robert Speicher ca171b8190 Update gitlab-workhorse versions in documentation
[ci skip]
2016-01-27 18:30:36 -05:00
Robert Speicher 716892b4fd Update CHANGELOG
[ci skip]
2016-01-27 17:48:52 -05:00