summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.debug-banzai-cacheDouwe Maan2016-01-041-7/+14
|
* Merge branch 'rs-delimit-all-the-things' into 'master' Dmitriy Zaporozhets2016-01-0411-36/+36
|\ | | | | | | | | | | | | number_with_delimiter most of the things See merge request !2258
| * number_with_delimiter most of the thingsrs-delimit-all-the-thingsRobert Speicher2015-12-3111-36/+36
| |
* | Merge branch 'rs-abuse-report-form' into 'master' Dmitriy Zaporozhets2016-01-041-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Add js-requires-input and js-quick-submit to abuse report form See merge request !2245
| * | Add js-requires-input and js-quick-submit to abuse report formrs-abuse-report-formRobert Speicher2015-12-301-2/+2
| | |
* | | Merge branch 'rs-remove-jquery-blockui' into 'master' Dmitriy Zaporozhets2016-01-042-591/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove jquery.blockUI.js plugin It was required but no longer used. See merge request !2273
| * | | Remove jquery.blockUI.js pluginRobert Speicher2016-01-012-591/+0
| | | | | | | | | | | | | | | | It was required but never used.
* | | | Merge branch 'rs-remove-jquery-history-js' into 'master' Dmitriy Zaporozhets2016-01-044-6/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Remove jquery.history.js pluginrs-remove-jquery-history-jsRobert Speicher2016-01-014-6/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'autocomplete-performance' into 'master' Dmitriy Zaporozhets2016-01-046-5/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improving autocomplete performance part 2 Related issue: gitlab-org/gitlab-ce#3507 See merge request !2253
| * | | | Optimize CSS expressions produced by Nokogiriautocomplete-performanceYorick Peterse2015-12-314-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Don't use delegate to delegate trivial methodsYorick Peterse2015-12-311-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Use XPath for searching link nodesYorick Peterse2015-12-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'rs-bump-bootstrap-sass' into 'master' Dmitriy Zaporozhets2016-01-042-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Bump bootstrap-sass to ~> 3.3.0rs-bump-bootstrap-sassRobert Speicher2016-01-012-6/+6
| | | | | |
* | | | | | Merge branch 'rs-bump-cal-heatmap' into 'master' Dmitriy Zaporozhets2016-01-046-50/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump cal-heatmap-rails to ~> 3.5.0 See merge request !2276
| * | | | | | Update cal-heatmap style overridesrs-bump-cal-heatmapRobert Speicher2016-01-011-36/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some were no longer needed, others needed `!important`.
| * | | | | | Simplify `ContributionsCalendar#starting_year` and `#starting_month`Robert Speicher2016-01-011-2/+2
| | | | | | |
| * | | | | | Reorder JS requiresRobert Speicher2016-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The old way broke d3, for some reason.
| * | | | | | Remove unused "options" object from Calendar JSRobert Speicher2016-01-011-5/+0
| | | | | | |
| * | | | | | Bump d3_rails to ~> 3.5.0Robert Speicher2016-01-012-2/+2
| | | | | | |
| * | | | | | Bump cal-heatmap-rails to ~> 3.5.0Robert Speicher2016-01-012-3/+3
| |/ / / / /
* | | | | | Merge branch 'expire-cache-on-app-settings-change' into 'master' Dmitriy Zaporozhets2016-01-044-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Expire view caches when application settings changeStan Hu2016-01-034-3/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes #5728
* | | | | | Merge branch 'docs/local-share-upload' into 'master' Achilleas Pipinellis2016-01-041-0/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | docs: raketasks: Add documentation on uploading to mounted sharesNathan Lowe2015-12-291-0/+43
| | | | | | |
* | | | | | | Merge pull request #9943 from Atul9/masterStan Hu2016-01-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update copyright notice to 2016 [ci skip]
| * | | | | | | Update copyright notice to 2016 [ci skip]Atul Bhosale2016-01-031-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs-safari-version-check' into 'master' Dmitriy Zaporozhets2016-01-032-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Don't attempt to set Referrer policy in Safarirs-safari-version-checkRobert Speicher2015-12-312-5/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'fix_ci_settings_typo' into 'master' Robert Speicher2016-01-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in CI settings Remove a little typo in the CI section of the settings. See merge request !2270
| * | | | | | Fix typo in CI settingsSteffen Köhler2016-01-011-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix_broken_docs_link' into 'master' Achilleas Pipinellis2016-01-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken SVN migration link Closes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/45 See merge request !2271
| * | | | | Fix broken SVN migration link [ci skip]Achilleas Pipinellis2016-01-011-1/+1
| | | | | |
* | | | | | Update CHANGELOGRobert Speicher2015-12-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'spinach_random_fix' into 'master' Valery Sizov2015-12-311-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spinach fix /cc @rspeicher @rdavila See merge request !2263
| * | | | | spinach fixValery Sizov2015-12-311-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'update-allocations-gem' into 'master' Yorick Peterse2015-12-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | See merge request !2262
| * | | | | Updated allocations Gem to version 1.0.3update-allocations-gemYorick Peterse2015-12-311-1/+1
| |/ / / /
* | | | | Merge branch 'reduce-influxdb-tags' into 'master' Yorick Peterse2015-12-312-8/+2
|\ \ \ \ \ | |/ / / / |/| | | | See merge request !2252
| * | | | Removed various default metrics tagsreduce-influxdb-tagsYorick Peterse2015-12-312-8/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'zj/gitlab-ce-swap-position-author-assignee-selector-issueable' ↵Robert Speicher2015-12-303-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Swap Author and Assignee Selectors on issuable index view Closes #4039 See merge request !2256
| * | | | Update CHANGELOGRobert Speicher2015-12-301-1/+0
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Fix "I see current user as the first user" stepRobert Speicher2015-12-301-5/+4
| | | | | | | | | | | | | | | | | | | | Why did this break? `¯\_(ツ)_/¯`
| * | | | Swap Author and Assignee Selectors on issuable index viewZeger-Jan van de Weg2015-12-302-4/+6
|/ / / / | | | | | | | | | | | | Closes #4039
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Speicher2015-12-301-8/+0
|\ \ \ \
| * \ \ \ Merge branch 'remove-whenever-schedule' into 'master' Robert Speicher2015-12-301-8/+0
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Remove unused config/schedule.rb file [ci skip] See merge request !2249
| | * | | We don't use whenever anymore. Lets remove the schedule fileJeroen van Baarsen2015-12-301-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **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>
* | | | | Update CHANGELOGRobert Speicher2015-12-301-1/+1
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'fix-build' into 'master' Robert Speicher2015-12-301-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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