Commit Graph
22224 Commits
Author SHA1 Message Date
Douwe Maan 4b027bc93a Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue. 2016-01-04 14:30:30 +01:00
Yorick Peterse 8de491a68f Fix Rubocop styling in AR subscriber specs 2016-01-04 14:21:39 +01:00
Dmitriy Zaporozhets 57074d606b Merge branch 'stabilize_emoji' into 'master'
Catch Emoji name lookup error

This is a first part of the fix https://gitlab.com/gitlab-org/gitlab-ce/issues/5829

See merge request !2282
2016-01-04 13:14:29 +00:00
Douglas Barbosa Alexandre 567dc62b6d Show 'All' tab by default in the builds page 2016-01-04 10:21:10 -02:00
Yorick Peterse 2ee8f55599 Automatically prefix transaction series names
This ensures Rails and Sidekiq transactions are split into the series
"rails_transactions" and "sidekiq_transactions" respectively.
2016-01-04 13:17:02 +01:00
Valery Sizov 4c5be69583 catch Emoji encode error 2016-01-04 14:06:48 +02:00
Yorick Peterse 2ea464bb27 Use separate series for Rails/Sidekiq sample stats
This removes the need for any tags to differentiate between Sidekiq and
Rails statistics while still being able to separate the two.
2016-01-04 12:45:31 +01:00
Yorick Peterse 825b46f8a3 Track total method call times per transaction
This makes it easier to see where time is spent without having to
aggregate all the individual points in the method_calls series.
2016-01-04 12:19:45 +01:00
Yorick Peterse 66a997a914 Track total query/view timings in transactions 2016-01-04 12:14:36 +01:00
Yorick Peterse 96075be6f4 Ability to increment custom transaction values
This will be used to store/increment the total query/view rendering
timings on a per transaction basis. This in turn can greatly reduce the
amount of metrics stored.
2016-01-04 11:37:46 +01:00
Dmitriy Zaporozhets b9ec1aaec8 Merge branch 'rs-delimit-all-the-things' into 'master'
number_with_delimiter most of the things



See merge request !2258
2016-01-04 10:36:54 +00:00
Dmitriy Zaporozhets 57377376cc Merge branch 'rs-abuse-report-form' into 'master'
Add js-requires-input and js-quick-submit to abuse report form



See merge request !2245
2016-01-04 10:28:09 +00:00
Dmitriy Zaporozhets bc12750fcc Merge branch 'rs-remove-jquery-blockui' into 'master'
Remove jquery.blockUI.js plugin

It was required but no longer used.

See merge request !2273
2016-01-04 10:25:15 +00:00
Dmitriy Zaporozhets 8a04b84e09 Merge branch 'rs-remove-jquery-history-js' into 'master'
Remove jquery.history.js plugin

We're not concerning ourselves with non-HTML5 browser compatibility, and
this removes 21 KB from our compiled JavaScript.

Bonus fix: There was an extra space after the query string in the URLs
that has now been removed.

See merge request !2272
2016-01-04 10:24:12 +00:00
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
Josh Frye edd2ce3836 Change text back. Add additional tests. 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 796c11e9a7 Remove feature tag from testing locally 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 95e6327b85 Fix tests 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 8bfc46451e Show 'New Merge Request' buttons on canonical repo. 2016-01-03 18:12:27 -05:00
Stan Hu 086cfc8685 Fix API project lookups when querying with a namespace with dots
Attempting to use the /projects/:id API by specifying :id in
"namespace/project" format would always result in a 404 if the namespace
contained a dot.

The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints:

"By default the :id parameter doesn't accept dots - this is because the dot is
used as a separator for formatted routes. If you need to use a dot within an
:id add a constraint which overrides this - for example id: /[^\/]+/ allows
anything except a slash."

Closes https://github.com/gitlabhq/gitlabhq/issues/9573
2016-01-03 15:08:44 -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 fd178c1e7d Prevent duplicate "username has already been taken" validation message
Closes #201 - two-year-old bug, woo! 💥 🎉
2016-01-02 20:03:28 -05:00
Robert Speicher 71c31ecf73 Ensure the sweep always starts from the left 2016-01-02 20:00:52 -05:00
Robert Speicher e5800d65de Use the logo as a loading indicator
Closes #5616
2016-01-02 15:43:02 -05:00
Robert Speicher c80f75ea1f Give the logo shapes meaningful IDs 2016-01-02 15:29:55 -05:00
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
Robert Speicher 3c4d24b71e Remove jquery.blockUI.js plugin
It was required but never used.
2016-01-01 17:52:40 -05:00
Robert Speicher f3ea2f29a5 Remove jquery.history.js plugin
We're not concerning ourselves with non-HTML5 browser compatibility, and
this removes 21 KB from our compiled JavaScript.

Bonus fix: There was an extra space after the query string in the URLs
that has now been removed.
2016-01-01 17:44:21 -05: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 bf249550d0 number_with_delimiter most of the things 2015-12-31 20:04:23 -05:00
Mike Wyatt cf4ccdda27 Merge remote-tracking branch 'upstream/master' into better-asana-refs
* upstream/master: (307 commits)
  Update CHANGELOG
  spinach fix
  Updated allocations Gem to version 1.0.3
  Removed various default metrics tags
  Update CHANGELOG
  Fix "I see current user as the first user" step
  Swap Author and Assignee Selectors on issuable index view
  Update CHANGELOG
  Make sure that is no pending migrations in Gitlab::CurrentSettings
  Added additional config environmental variables to help Debian packaging
  We don't use whenever anymore. Lets remove the schedule file
  Fix project transfer e-mail sending incorrect paths in e-mail notification
  Update CHANGELOG
  Use Gitlab::CurrentSettings for InfluxDB
  Write to InfluxDB directly via UDP
  Strip newlines from obfuscated SQL
  Add hotfix that allows to access build artifacts created before 8.3
  note votes methids implementation
  When reCAPTCHA is disabled, allow registrations to go through without a code
  Downcased user or email search for avatar_icon.
  ...
2015-12-31 18:45:55 -04:00
Mike Wyatt 571df5f44b Use execute in Asana specs 2015-12-31 18:29:00 -04:00
Mike Wyatt 90029a5caa Actually test the posted comment in Asana service 2015-12-31 18:27:34 -04:00