summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove `random_markdown_tip` helperrs-remove-markdown-tipsRobert Speicher2016-04-092-30/+0
| | | | Only usage got removed in !3442
* 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
| * | | | | Update gitlab-shell to 2.7.2Yorick Peterse2016-04-071-1/+1
| | | | | |
* | | | | | Merge branch '15078-todo-row' into 'master' Jacob Schatz2016-04-081-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use meta key to open todo in new tab Fixes #15078 See merge request !3623
| * | | | | | Use meta key to open todo in new tab15078-todo-rowAnnabel Dunstone2016-04-081-2/+7
| | | | | | |
* | | | | | | Merge branch 'remove-todo' into 'master' Dmitriy Zaporozhets2016-04-081-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove TODO for not documented stuff We should not put a `TODO` in a released product. See merge request !3553
| * | | | | | | Remove TODO for not documented stuffRobert Schilling2016-04-051-4/+0
| | | | | | | |
* | | | | | | | Merge branch 'rs-testing-guide' into 'master' Dmitriy Zaporozhets2016-04-083-1/+136
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at a Testing styleguide Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14121 [ci skip] See merge request !3465
| * | | | | | | | Add a link back to Development documentation to Testing guiders-testing-guideRobert Speicher2016-04-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Add a section about `let` to the Testing guideRobert Speicher2016-04-011-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Factories don't have to be limited to `ActiveRecord` objectsRobert Speicher2016-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Add a note about Four-Phase Test to Testing guideRobert Speicher2016-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | First pass at a Testing styleguideRobert Speicher2016-04-013-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'metrics-timestamp-precision' into 'master' Yorick Peterse2016-04-081-1/+21
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use more accurate timestamps for InfluxDB. See merge request !3617
| * | | | | | | | Use more accurate timestamps for InfluxDB.metrics-timestamp-precisionYorick Peterse2016-04-081-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the timestamp of metrics to be more accurate/unique by using Time#to_f combined with a small random jitter value. This combination hopefully reduces the amount of collisions, though there's no way to fully prevent any from occurring. Fixes gitlab-com/operations#175
* | | | | | | | | Merge branch 'gitlab-workhorse-0.7.2' into 'master' Yorick Peterse2016-04-083-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.7.2 See merge request !3570
| * | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-04-0773-310/+1052
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-workhorse-0.7.2
| * | | | | | | | | Use gitlab-workhorse 0.7.2Jacob Vosmaer2016-04-063-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'api-expose-subscribed' into 'master' Rémy Coutable2016-04-087-25/+46
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose subscribed? on issues and merge requests This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests. Related to #6024 See merge request !3611
| * | | | | | | | | API: Expose subscribed? on issuesRobert Schilling2016-04-087-25/+46
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Schilling2016-04-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Incorrect Quote In Docker Executor Example ## What does this MR do? The corrected line opened with a regular quote (') but closed with a back-tick (`) I believe this is invalid bash syntax ## Are there points in the code the reviewer needs to double check? Probably not ## Why was this MR needed? Fixes error when example is copied and pasted ## What are the relevant issue numbers? None ## Screenshots (if relevant) None See merge request !3604
View Lorry Controller Status