summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor GitHub importer documentationdoc_github_importAchilleas Pipinellis2016-01-125-10/+36
| | | | [ci skip]
* Merge branch 'changelog-metrics' into 'master' Yorick Peterse2016-01-121-0/+3
|\ | | | | See merge request !2385
| * Updated CHANGELOG with changes I madeYorick Peterse2016-01-121-0/+3
|/ | | | | | I forgot to add these in the respective MRs. [ci skip]
* Merge branch 'update-fog' into 'master' Dmitriy Zaporozhets2016-01-123-18/+65
|\ | | | | | | | | | | | | | | | | Bump fog to 1.36.0 Updates AWS regions and fixes a number of bugs. Tested a GitLab AWS backup without any issues. Closes #4231 See merge request !2373
| * Bump fog to 1.36.0Stan Hu2016-01-113-18/+65
| | | | | | | | Closes #4231
* | Merge branch 'hover-descriptions' into 'master' Dmitriy Zaporozhets2016-01-121-5/+9
|\ \ | | | | | | | | | | | | | | | | | | adds hover titles to merge request and issue pages Fixes #5899 See merge request !2375
| * | adds hover titles to merge request and issue pageshover-descriptionsJacob Schatz2016-01-111-5/+9
| |/
* | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | changes bolded on active for dropdowns, sitewide. Fixes #6056 <br/> **Note:** this change applies to all dropdowns. Currently all dropdowns using bootstrap's dropdown.js apply a bold and larger font for an active state. See merge request !2377
| * | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
| | |
* | | Merge branch 'rs-add-title-to-emoji' into 'master' Dmitriy Zaporozhets2016-01-121-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add title attribute to Emojis in award picker See merge request !2378
| * | | Add title attribute to Emojis in award pickerrs-add-title-to-emojiRobert Speicher2016-01-111-3/+6
| | | |
* | | | Merge branch 'rs-remove-coffee-filters' into 'master' Dmitriy Zaporozhets2016-01-121-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `:coffee` and `:coffeescript` Haml filters See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897 See merge request !2380
| * | | | Remove the `:coffee` and `:coffeescript` Haml filtersrs-remove-coffee-filtersRobert Speicher2016-01-111-0/+6
|/ / / / | | | | | | | | | | | | See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897
* | | | Merge branch 'typo-fix' into 'master' Robert Schilling2016-01-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fixed minor typo in docker documentation This change is self-explanatory. See merge request !2374
| * | | | [ci skip] Fixed minor typo in docker documentationJohn Galt2016-01-111-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'rs-clear-current-timer' into 'master' Robert Speicher2016-01-111-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Call clearInterval for the currentTimer if one exists Prevents a double-click from causing the logo to sweep forever after a load completes. See merge request !2379
| * | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
|/ / / | | | | | | | | | | | | Prevents a double-click from causing the logo to sweep forever after a load completes.
* | | Update CHANGELOGRobert Speicher2016-01-111-6/+6
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-114-5/+16
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Allow subsequent validations in CI Linter Closes #5851 See merge request !2368
| * | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-114-5/+16
| | | | | | | | | | | | Closes #5851
* | | Merge branch 'fix-ci-builds-for-tags' into 'master' Robert Speicher2016-01-112-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Generate builds when creating tag using web interface Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4296 See merge request !2366
| * | | Generate builds when creating tag using web interfacefix-ci-builds-for-tagsKamil Trzcinski2016-01-112-0/+2
| | | |
* | | | Merge branch 'gitlab-workhorse-0.5.3' into 'master' Robert Speicher2016-01-113-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.5.3 See merge request !2367
| * | | | Use gitlab-workhorse 0.5.3gitlab-workhorse-0.5.3Jacob Vosmaer2016-01-113-3/+3
| | | | |
* | | | | Merge branch 'optimize_ldap' into 'master' Douwe Maan2016-01-117-11/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize LDAP and add a search timeout Related to #4282 This merge request arranges some things in `access.rb` to facilitate some optimizations in EE (to come later). It also adds a 10 second timeout to all LDAP searches so the entire worker is not blocked if some query doesn't return in a reasonable amount of time. This timeout is configurable per LDAP server. See merge request !2267
| * | | | | Optimize LDAP and add a search timeoutDrew Blessing2016-01-117-11/+37
| | | | | |
* | | | | | Merge branch 'add-action-to-all-metrics' into 'master' Yorick Peterse2016-01-116-25/+41
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | See merge request !2370
| * | | | | Tag all transaction metrics with an "action" tagYorick Peterse2016-01-116-25/+41
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this it's impossible to find out what methods/views/queries are executed by a certain controller or Sidekiq worker. While this will increase the total number of series it should stay within reasonable limits due to the amount of "actions" being small enough.
* | | | | Merge branch 'rs-omniauth-client-versions' into 'master' Dmitriy Zaporozhets2016-01-112-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add versions to omniauth_crowd and omniauth-azure-oauth2 Also sorts them alphabetically, because OCD. See merge request !2364
| * | | | | Add versions to omniauth_crowd and omniauth-azure-oauth2rs-omniauth-client-versionsRobert Speicher2016-01-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also sorts them alphabetically, because OCD.
* | | | | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-118-13/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of getting issues on group level For testing I used the URL http://localhost:3000/groups/gitlab-org/issues?milestone_title=8.1. Prior to these changes said URL would take about 10-12 seconds to load. By applying these changes the loading time has been reduced to roughly 2-3 seconds. There's still some stuff going on in some views that I have to look at, resolving those changes might reduce the loading time a bit more. I also still have to check if I didn't break too many tests. Fixes: gitlab-org/gitlab-ce#3707 gitlab-org/gitlab-ce#4071 See merge request !2318
| * | | | | | Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These scopes don't care about the order. Removing the explicit "ORDER BY" can speed up the queries by a little bit.
| * | | | | | Fixed issue sorting specs for ID changesYorick Peterse2016-01-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These specs assumed data was still sorted by timestamp, instead of by ID.
| * | | | | | Updated Gemfile.lock due to Bundler re-orderingYorick Peterse2016-01-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundler keeps re-ordering this particular Gem every time something is executed using "bundle exec".
| * | | | | | Drop projects order in IssuableFinderYorick Peterse2016-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When grabbing the projects to filter issues by we don't care about the order they're returned in. By removing the ORDER BY the resulting query can be quite a bit faster.
| * | | | | | Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces plucking of IDs with a sub-query, saving the overhead of loading the data in Ruby and then mapping the rows to an Array of IDs. This also scales much better when dealing with a large amount of IDs that would be involved.
| * | | | | | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-073-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead.
| * | | | | | Added an index on milestones.titleYorick Peterse2016-01-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain pages (e.g. the group wide issues page) filter miletones by their title. Without an index this will result in a sequence scan on a large dataset increasing the total loading time of a page.
* | | | | | | Merge branch 'rs-woff-fonts' into 'master' Dmitriy Zaporozhets2016-01-1132-7/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use WOFF versions of SourceSansPro See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023 See merge request !2357
| * | | | | | Use WOFF versions of SourceSansPrors-woff-fontsRobert Speicher2016-01-0932-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-115-128/+119
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-115-128/+119
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ZenMode - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling. See merge request !2354
| | * | | | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-085-128/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling.
* | | | | | | | Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erbDouwe Maan2016-01-113-22/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | use JavaScript instead of CoffeeScript in Views for master
| * | | | | | | use JavaScript instead of CoffeeScript in Views, the reason #9819Jason Lee2016-01-113-22/+24
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix-build-status-caching' into 'master' Dmitriy Zaporozhets2016-01-112-5/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching issue where build status was not updating in project dashboard The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable. Closes #3268 See merge request !2353
| * | | | | | Fix caching issue where build status was not updating in project dashboardStan Hu2016-01-082-5/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | Closes #3268
* | | | | | Merge branch 'load-autocomplete-when-needed' into 'master' Dmitriy Zaporozhets2016-01-112-12/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only load autocomplete data when actually needed See merge request !2365
| * | | | | | Only load autocomplete data when actually neededYorick Peterse2016-01-112-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this would result in autocomplete data being loaded for every page (e.g. the page showing all Git branches of a project).
* | | | | | | Merge branch 'fix-build-page-typo' into 'master' Kamil Trzciński2016-01-111-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in build page of projects The column containing links to the builds is named Runner but actually contains the Build. See merge request !2347
View Lorry Controller Status