summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use existence operator insteadissue_14353Alfredo Sumaran2016-04-101-1/+1
|
* Check existence of variable methodAlfredo Sumaran2016-04-101-1/+1
| | | | This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.
* Ignore toggling sidebar for above 1200px resolutionAlfredo Sumaran2016-04-101-1/+2
|
* Merge branch 'rs-markdown-preview-tabindex' into 'master' Jacob Schatz2016-04-101-3/+3
|\ | | | | | | | | | | | | Remove tab stop from "Write", "Preview", "Go full screen" links Closes #15089 See merge request !3635
| * Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindexRobert Speicher2016-04-091-3/+3
| | | | | | | | Closes #15089
* | Merge branch 'redesign_labels_page' into 'master' Jacob Schatz2016-04-106-11/+74
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
| * | apply some css changesredesign_labels_pageArinde Eniola2016-04-061-4/+1
| | |
| * | fix the failing tests and some changesArinde Eniola2016-04-064-14/+18
| | |
| * | finish up the design and add info to the changelogArinde Eniola2016-04-064-8/+15
| | |
| * | make the view responsive for extra small deviceArinde Eniola2016-04-061-0/+20
| | |
| * | set the width to the elementsArinde Eniola2016-04-061-2/+3
| | |
| * | change the subscribe, delete and edit buttons to iconsArinde Eniola2016-04-063-8/+42
| | |
* | | Merge branch 'project-services-page-should-contain-full-info' into 'master' Achilleas Pipinellis2016-04-102-15/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Everything on one page. See merge request !3636
| * | | Everything on one page.project-services-page-should-contain-full-infoSytse Sijbrandij2016-04-092-15/+21
| | | |
* | | | Merge branch 'fix-project-last-activity-at-migration' into 'master' Robert Speicher2016-04-101-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use raw SQL instead of Rails models in 20130403003950 migration Closes gitlab-org/gitlab-development-kit#109 Closes https://github.com/gitlabhq/gitlabhq/issues/10123 See merge request !3638
| * | | | Use raw SQL instead of Rails models in 20130403003950 migrationStan Hu2016-04-091-7/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-development-kit#109 Closes https://github.com/gitlabhq/gitlabhq/issues/10123
* | | | Merge branch 'rs-sidekiq-sentry-context' into 'master' Stan Hu2016-04-101-0/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `sidekiq` tag to Sentry Raven context This will let us filter errors that were/were not in the Sidekiq environment. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092 See merge request !3634
| * | | Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-contextRobert Speicher2016-04-091-0/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This will let us filter errors by the program environment in which they were encountered. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092
* | | Merge branch 'enable-compress-in-production' into 'master' Robert Speicher2016-04-092-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Enable asset compression in production. `config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344. See merge request !3632
| * | Enable asset compression in production.connorshea2016-04-092-0/+4
| | | | | | | | | | | | | | | | | | `config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344.
* | | Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-0919-74/+119
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Diff redesign Fixes #14400 Fixes #13500 ![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif) See merge request !3476
| * | Remove comment count & icon from side by side view14400-diff-redesignAnnabel Dunstone2016-04-071-6/+0
| | |
| * | Diff touch upsAnnabel Dunstone2016-04-075-11/+8
| | |
| * | Fix lint errorsAnnabel Dunstone2016-04-073-8/+6
| | |
| * | Remove comment count & iconAnnabel Dunstone2016-04-071-3/+0
| | |
| * | Diff design updatesAnnabel Dunstone2016-04-0715-67/+90
| | |
| * | Merge conflict fixesAnnabel Dunstone2016-04-071-15/+15
| | |
| * | Update diff_comments testsAnnabel Dunstone2016-04-072-5/+5
| | |
| * | Update diff colors and iconsAnnabel Dunstone2016-04-077-15/+29
| | |
| * | Move diff colors to variablesAnnabel Dunstone2016-04-073-14/+24
| | |
| * | Change reply button to text fieldAnnabel Dunstone2016-04-072-7/+19
| | |
* | | Merge branch 'upgrade-sprockets' into 'master' Robert Speicher2016-04-092-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sprockets to 3.6.0 Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Closes #14344. See merge request !3544
| * | | Upgrade Sprockets from 3.3.5 to 3.6.0.connorshea2016-04-092-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Resolves #14344.
* | | | Merge branch 'schema-remove-twitter-sharing' into 'master' Robert Speicher2016-04-091-2/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Ensure schema version matches latest migration From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d See merge request !3627
| * | | Apparently I missed updating the schema.rb when removing the Twitter ↵connorshea2016-04-091-2/+1
|/ / / | | | | | | | | | | | | | | | "Congrats" button From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d
* | | Minor Testing guide copyeditsRobert Speicher2016-04-091-8/+10
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'rs-update-rails' into 'master' Robert Speicher2016-04-093-37/+38
|\ \ \ | | | | | | | | | | | | | | | | Bump rails to 4.2.6 See merge request !3424
| * | | Bump rails to 4.2.6rs-update-railsRobert Speicher2016-04-053-37/+38
| | | |
* | | | Merge branch 'efficient-emoji-loading' into 'master' Robert Speicher2016-04-093-10/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only load emoji spritesheet when necessary On a normal issue where the only award emoji displayed by default are the thumbs-up and thumbs-down emoji, this decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334. See merge request !3449
| * | | | Add "sprite" parameter to emoji_icon helperconnorshea2016-04-083-10/+26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emoji_icon helper used to display the award emoji in Issue and Merge Request views. By default the spritesheet is used, but passing `sprite: false` to the `emoji_icon` helper makes the emoji render as separate images. For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and any that have been awarded to the issue/MR) the independent images are used. Only when the full emoji menu is opened does the full spritesheet load. On a normal issue this change decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334.
* | | | Merge branch 'fix-oxford-comma' into 'master' Robert Speicher2016-04-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing Oxford comma in some text on the Activity graph. Resolves #14668. [ci skip] See merge request !3625
| * | | | Add a missing Oxford comma in some text on the Activity graph.connorshea2016-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | Resolves #14668. [ci skip]
* | | | | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-0810-54/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
| * | | | | Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer2016-04-073-4/+4
| | | | | |
| * | | | | Make redis an explicit Gemfile dependencyJacob Vosmaer2016-04-062-1/+5
| | | | | |
| * | | | | Be careful when setting class instance varsJacob Vosmaer2016-04-041-2/+13
| | | | | |
| * | | | | Add Gitlab::Redis connection poolJacob Vosmaer2016-04-047-23/+31
| | | | | |
* | | | | | Merge branch 'instrument-rails-cache' into 'master' Yorick Peterse2016-04-083-0/+111
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument Rails cache code See merge request !3619
| * | | | | | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-083-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to track how much time of a transaction is spent in dealing with cached data.
* | | | | | | Merge branch 'update-gitlab-shell' into 'master' Yorick Peterse2016-04-081-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Update gitlab-shell to 2.7.2 See merge request !3594
View Lorry Controller Status