Commit Graph
22119 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets cbf34cdbcb Merge branch 'autocomplete-performance' into 'master'
Improving autocomplete performance part 2

Related issue: gitlab-org/gitlab-ce#3507

See merge request !2253
2016-01-04 10:22:44 +00:00
Dmitriy Zaporozhets a2ba239fb4 Merge branch 'rs-bump-bootstrap-sass' into 'master'
Bump bootstrap-sass to ~> 3.3.0

Resolves bootlint error:

`bootlint:  W013  Bootstrap version might be outdated. Latest version is at least 3.3.6 ; saw what appears to be usage of Bootstrap 3.3.5`

See merge request !2275
2016-01-04 10:19:31 +00:00
Dmitriy Zaporozhets 55e12ccd8a Merge branch 'rs-bump-cal-heatmap' into 'master'
Bump cal-heatmap-rails to ~> 3.5.0



See merge request !2276
2016-01-04 10:18:23 +00:00
Dmitriy Zaporozhets f8696018cc Merge branch 'expire-cache-on-app-settings-change' into 'master'
Expire view caches when application settings change

If the admin disables Gravatar, for example, before the views would not invalidate. Now they invalidate automatically when this happens.

Closes #5728

See merge request !2280
2016-01-04 09:41:28 +00:00
Achilleas Pipinellis 34e1c18c53 Merge branch 'docs/local-share-upload' into 'master'
docs: raketasks: Add documentation on uploading to mounted shares

Fog has a local storage provider, which can be use to copy backups to locally mounted cifs / nfs / smb shares. This MR adds documentation to doc/raketasks/backup_restore.md in response to #3387.

@stanhu I found some time tonight and was able to get this started earlier than I initially expected, glad I could contribute.

See merge request !2246
2016-01-04 08:42:39 +00:00
Stan Hu 0a62d3b5d5 Merge pull request #9943 from Atul9/master
Update copyright notice to 2016 [ci skip]
2016-01-03 22:44:31 -08:00
Dmitriy Zaporozhets bfb3c8d936 Merge branch 'rs-safari-version-check' into 'master'
Don't attempt to set Referrer policy in Safari

While Safari supports the policy, it does not (currently, as of 9.x)
recognize `origin-when-cross-origin` as a valid value, so we omit the
policy entirely under Safari.

Closes #5609

See merge request !2269
2016-01-03 19:23:30 +00:00
Stan Hu 2802d4992d Expire view caches when application settings change
Closes #5728
2016-01-03 11:20:14 -08:00
Atul Bhosale befdc67707 Update copyright notice to 2016 [ci skip] 2016-01-03 18:28:52 +05:30
Robert Speicher d1873f16b4 Update cal-heatmap style overrides
Some were no longer needed, others needed `!important`.
2016-01-01 22:12:50 -05:00
Robert Speicher 1a1113f7c4 Simplify ContributionsCalendar#starting_year and #starting_month 2016-01-01 22:11:34 -05:00
Robert Speicher 4caf0433b7 Reorder JS requires
The old way broke d3, for some reason.
2016-01-01 22:10:48 -05:00
Robert Speicher f8c3b69fb6 Remove unused "options" object from Calendar JS 2016-01-01 22:10:16 -05:00
Robert Speicher 2417f55467 Bump d3_rails to ~> 3.5.0 2016-01-01 21:34:49 -05:00
Robert Speicher 762210db6d Bump cal-heatmap-rails to ~> 3.5.0 2016-01-01 21:29:21 -05:00
Robert Speicher 93ef008500 Bump bootstrap-sass to ~> 3.3.0 2016-01-01 21:11:39 -05:00
Robert Speicher de6b6ccc42 Merge branch 'fix_ci_settings_typo' into 'master'
Fix typo in CI settings

Remove a little typo in the CI section of the settings.

See merge request !2270
2016-01-01 22:54:35 +00:00
Achilleas Pipinellis 636ae8bc82 Merge branch 'fix_broken_docs_link' into 'master'
Fix broken SVN migration link

Closes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/45

See merge request !2271
2016-01-01 12:58:00 +00:00
Achilleas Pipinellis 26de72a233 Fix broken SVN migration link [ci skip] 2016-01-01 13:52:26 +01:00
Steffen Köhler 74969021ef Fix typo in CI settings
[ci skip]
2016-01-01 13:34:24 +01:00
Robert Speicher 9a9a81bea0 Don't attempt to set Referrer policy in Safari
While Safari supports the policy, it does not (currently, as of 9.x)
recognize `origin-when-cross-origin` as a valid value, so we omit the
policy entirely under Safari.

Closes #5609
2015-12-31 20:44:55 -05:00
Robert Speicher d33cc4e530 Update CHANGELOG
[ci skip]
2015-12-31 14:21:31 -05:00
Valery Sizov 2c1f8e2d15 Merge branch 'spinach_random_fix' into 'master'
Spinach fix

/cc @rspeicher @rdavila 

See merge request !2263
2015-12-31 14:57:45 +00:00
Yorick Peterse 054df415f9 Optimize CSS expressions produced by Nokogiri
Nokogiri produces inefficient XPath expressions when given CSS
expressions such as "a.gfm". Luckily these expressions can be optimized
quite easily while still achieving the same results.

In the two cases where this optimization is applied the run time has
been reduced from around 170 ms to around 15 ms.
2015-12-31 15:46:47 +01:00
Yorick Peterse d3951dfaa1 Don't use delegate to delegate trivial methods
Around 300 ms (in total) would be spent in these delegated methods due
to the extra stuff ActiveSupport adds to the compiled methods. Because
these delegations are so simple we can just manually define the methods,
saving around 275 milliseconds.
2015-12-31 15:46:47 +01:00
Yorick Peterse 3077cb52d9 Use XPath for searching link nodes
This is a tad faster than letting Nokogiri figure out whether it should
evaluate the query as CSS or XPath and then actually evaluating it.
2015-12-31 15:46:47 +01:00
Yorick Peterse ab08321be8 Merge branch 'update-allocations-gem' into 'master'
See merge request !2262
2015-12-31 14:46:07 +00:00
Yorick Peterse 8e983d33d7 Merge branch 'reduce-influxdb-tags' into 'master'
See merge request !2252
2015-12-31 14:45:20 +00:00
Valery Sizov bf03acfa25 spinach fix 2015-12-31 15:59:08 +02:00
Yorick Peterse 6d5202e2b6 Updated allocations Gem to version 1.0.3 2015-12-31 12:27:23 +01:00
Yorick Peterse c936e4e3c8 Removed various default metrics tags
While it's useful to keep track of the different versions (Ruby, GitLab,
etc) doing so for every point wastes disk space and possibly also RAM
(which InfluxDB is all to eager to gobble up). If we want to see the
performance differences between different GitLab versions simply looking
at the performance since the last release date should suffice.
2015-12-31 11:26:04 +01:00
Robert Speicher 7945cf4163 Merge branch 'zj/gitlab-ce-swap-position-author-assignee-selector-issueable' into 'master'
Swap Author and Assignee Selectors on issuable index view

Closes #4039

See merge request !2256
2015-12-30 23:23:24 +00:00
Robert Speicher 00dc5f1b3e Update CHANGELOG
[ci skip]
2015-12-30 18:22:59 -05:00
Robert Speicher efc679e4aa Fix "I see current user as the first user" step
Why did this break? `¯\_(ツ)_/¯`
2015-12-30 18:22:59 -05:00
Zeger-Jan van de WegandRobert Speicher 1be406d741 Swap Author and Assignee Selectors on issuable index view
Closes #4039
2015-12-30 18:21:53 -05:00
Robert Speicher 586ac6460b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-30 16:57:47 -05:00
Robert Speicher a0b3654e2e Merge branch 'remove-whenever-schedule' into 'master'
Remove unused config/schedule.rb file

[ci skip]

See merge request !2249
2015-12-30 21:56:07 +00:00
Robert Speicher 5c6b9e8c57 Update CHANGELOG
[ci skip]
2015-12-30 16:51:47 -05:00
Robert Speicher 4ed369558e Merge branch 'fix-build' into 'master'
Ensure that is no pending migrations when using database on
Gitlab::CurrentSettings

This fixes the undefined method `recaptcha_enabled' for
#<ApplicationSetting:0x007f28552f8238> when running the build.

See merge request !2254
2015-12-30 20:18:30 +00:00
Sytse Sijbrandij 088d833c0a Merge branch 'feature/env_variables_for_emails' into 'master'
Added additional config environmental variables to help Debian packaging

* GITLAB_EMAIL_FROM
* GITLAB_EMAIL_DISPLAY_NAME
* GITLAB_EMAIL_REPLY_TO

This is a followup on https://gitlab.com/gitlab-org/gitlab-ce/issues/3717

See merge request !2251
2015-12-30 16:31:11 +00:00
Douglas Barbosa Alexandre ff98c631c1 Make sure that is no pending migrations in Gitlab::CurrentSettings 2015-12-30 14:26:54 -02:00
Gabriel Mazetto 82bfa8f40c Added additional config environmental variables to help Debian packaging
* GITLAB_EMAIL_FROM
* GITLAB_EMAIL_DISPLAY_NAME
* GITLAB_EMAIL_REPLY_TO
2015-12-30 12:45:24 -02:00
Jeroen van Baarsen a6fd7b74ee We don't use whenever anymore. Lets remove the schedule file
**Why is this needed?**

Not really needed, but having code that is not used around is confusing, so lets
remove it

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-12-30 13:42:57 +01:00
Grzegorz Bizon 333d3d9e5d Merge branch 'fix/missing-ci-build-traces' into 'master'
Hotfix for builds trace data integrity

Closes #4246

See merge request !2224
2015-12-30 06:54:27 +00:00
Nathan Lowe 8662f4737b docs: raketasks: Add documentation on uploading to mounted shares 2015-12-29 21:19:15 -05:00
Robert Speicher e70ffdbf29 Merge branch 'fix-user-autocomplete' into 'master'
Fixes problem with user autocomplete URI 

```
Failed to load resource: net::ERR_NAME_NOT_RESOLVED
http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false
```

Fixes #4118, #4136

See merge request !2136
2015-12-30 01:32:35 +00:00
Robert Speicher 961e38ac92 Merge branch 'fix-transfer-project-email' into 'master'
Fix project transfer e-mail sending incorrect paths in e-mail notification

The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race
condition where the mailer would be invoked before the project was committed
to the database, causing the transfer e-mail notification to show the old
path instead of the new one.

Closes #4670

See merge request !2235
2015-12-29 22:14:36 +00:00
Stan Hu 59533d47dd Fix project transfer e-mail sending incorrect paths in e-mail notification
The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race
condition where the mailer would be invoked before the project was committed
to the database, causing the transfer e-mail notification to show the old
path instead of the new one.

Closes #4670
2015-12-29 13:49:44 -08:00
Robert Speicher a80f2b792c Update CHANGELOG
[ci skip]
2015-12-29 16:29:45 -05:00
Valery Sizov eeba266e3d Merge branch 'upvote_count_to_api' into 'master'
Revert upvotes and downvotes params back to MR API

issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672

See merge request !2212
2015-12-29 16:07:12 +00:00