summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with sidebar link overlapsidebar-overlap-fixPhil Hughes2016-05-166-35/+32
| | | | Closes #17566
* Merge branch 'add-cache-count-metrics' into 'master' Yorick Peterse2016-05-163-10/+19
|\ | | | | | | | | Add cache count metrics to rails cache See merge request !4157
| * Add cache count metrics to rails cacheadd-cache-count-metricsPablo Carranza2016-05-153-10/+19
|/
* Merge branch 'dz-change-sidebar-colors' into 'master' Dmitriy Zaporozhets2016-05-141-4/+4
|\ | | | | | | | | | | | | | | | | Change colors for charcoal and graphite sidebar themes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler @jschatz1 See merge request !4149
| * Change colors for charcoal and graphite sidebar themesdz-change-sidebar-colorsDmitriy Zaporozhets2016-05-141-4/+4
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'refactor-diff-notes' into 'master' Douwe Maan2016-05-1338-454/+449
|\ | | | | | | | | | | | | | | | | Refactor diff notes Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4101 /cc @rspeicher See merge request !4110
| * Rename diff_with_notes partial.Douwe Maan2016-05-132-1/+1
| |
| * Satisfy RubocopDouwe Maan2016-05-131-1/+1
| |
| * "the outdated diff" -> "an outdated diff"Douwe Maan2016-05-131-1/+1
| |
| * Update specsDouwe Maan2016-05-134-84/+10
| |
| * Clean up LegacyDiffNote somewhatDouwe Maan2016-05-136-101/+154
| |
| * Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-136-7/+7
| |
| * Extract LegacyDiffNote out of NoteDouwe Maan2016-05-1333-370/+386
| |
* | Merge branch 'doc_to_docs' into 'master' Achilleas Pipinellis2016-05-1320-24/+24
|\ \ | | | | | | | | | | | | | | | | | | Change all occurrences of doc.gitlab.com to docs.gitlab.com Now that https://gitlab.com/gitlab-com/operations/issues/233 kicked in. See merge request !4148
| * | Change all occurrences of doc.gitlab.com to docs.gitlab.comAchilleas Pipinellis2016-05-1320-24/+24
|/ / | | | | | | [ci skip]
* | Merge branch 'revert-3955' into 'master' Achilleas Pipinellis2016-05-131-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master'" This reverts commit 66d8ef1ad9d5952b7e7f026658f71aafc861950e, reversing changes made to 6a8359f3d3be01af6f5b124b61af7ee1c77c17d0. The `--with` option was added in Bundler 1.10 but in this case it shouldn't even be needed: I've tested the original command locally and the pg gem was installed, so I believe the user that opened the original MR ran the wrong command (i.e. `sudo -u git -H bundle install --without development test postgres --deployment` instead of `sudo -u git -H bundle install --without development test mysql --deployment`. See discussion at https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e for more context. See merge request !4144
| * | Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master' "revert-3955Rémy Coutable2016-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 66d8ef1ad9d5952b7e7f026658f71aafc861950e, reversing changes made to 6a8359f3d3be01af6f5b124b61af7ee1c77c17d0. The `--with` option was added in Bundler 1.10 but in this case it shouldn't even be needed: I've tested the original command locally and the pg gem was installed, so I believe the user that opened the original MR ran the wrong command (i.e. `sudo -u git -H bundle install --without development test postgres --deployment` instead of `sudo -u git -H bundle install --without development test mysql --deployment`. See discussion at https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e for more context.
* | | Merge branch 'remove-deprecated-finders' into 'master' Douwe Maan2016-05-132-3/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove activerecord-deprecated_finders gem We don’t use any of the deprecated finders, so it should be safe to remove. See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information. Resolves #17015. See merge request !3981
| * | Remove activerecord-deprecated_finders gemConnor Shea2016-05-102-3/+0
| | | | | | | | | | | | | | | | | | | | | We don’t use any of the deprecated finders, so it should be safe to remove. Resolves #17015.
* | | Merge branch 'rubocop/space-around-operators' into 'master' Robert Speicher2016-05-1334-80/+80
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubocop: require space round operators This enables rubocop to require space around opertators and fix offenses in the codebase. There is another merge-request to solve remaining offenses in EE codebase, merge it first: gitlab-org/gitlab-ee!388 Fixes #17398 See merge request !4112
| * | | remove extra space to fix codestylerubocop/space-around-operatorsGabriel Mazetto2016-05-131-1/+1
| | | |
| * | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-1333-77/+77
| | | |
| * | | Require space around operatorsGabriel Mazetto2016-05-131-2/+2
| | | |
* | | | Merge branch '17338-sidebar-width' into 'master' Dmitriy Zaporozhets2016-05-132-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce width of side nav Closes #17338 Part of #14838 Left: old; Right: new <img src="/uploads/7dba5f22d6bdf1249bab5166addb25b5/Screen_Shot_2016-05-10_at_4.34.07_PM.png" width="500px"> See merge request !4109
| * | | | Undo changes; reduce sidebar internal width17338-sidebar-widthAnnabel Dunstone2016-05-121-9/+4
| | | | |
| * | | | No extra link padding at xs screen sizeAnnabel Dunstone2016-05-101-2/+4
| | | | |
| * | | | Reduce width of side navAnnabel Dunstone2016-05-102-5/+8
| | |/ / | |/| |
* | | | Merge branch '17501-dropdown-bug' into 'master' Dmitriy Zaporozhets2016-05-134-2/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mobile dropdown bug Closes #17501 ![dropdown](/uploads/d0cc6d9472bd8aa1aaf392d5c4eb3791/dropdown.gif) See merge request !4142
| * | | | Fix mobile dropdown bugAnnabel Dunstone2016-05-134-2/+29
| | | | |
* | | | | Merge branch 'dz-fix-issue-sidebar' into 'master' Dmitriy Zaporozhets2016-05-133-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UI issues caused by header height decrease to 50px - fix blank spacing for issue sidebar - fix login btn alignment for non logged in users See merge request !4143
| * | | | | Fix login btn vertical alignDmitriy Zaporozhets2016-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix issue sidebar top position after header height changeDmitriy Zaporozhets2016-05-132-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'dz-update-changelog' into 'master' Robert Speicher2016-05-131-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add UI changes in 8.8 to changelog For !3824 and !3980 [ci skip] See merge request !4140
| * | | | Add UI changes in 8.8 to changelogdz-update-changelogDmitriy Zaporozhets2016-05-131-0/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'dz-improve-sidebar-design' into 'master' Dmitriy Zaporozhets2016-05-131-4/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove background color differentiation from gitlab logo/text in sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @annabeldunstone @skyruler See merge request !4139
| * | | Remove background color differentiation from gitlab logo/text in sidebardz-improve-sidebar-designDmitriy Zaporozhets2016-05-131-4/+1
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch '17485-broadcast-msg' into 'master' Dmitriy Zaporozhets2016-05-131-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Move broadcast msg into content-wrapper Closes #17485 <img src="/uploads/ab365f471209c55d2ee876cf558d4032/Screen_Shot_2016-05-12_at_4.21.22_PM.png" width="800px"> See merge request !4132
| * | Move broadcast msg into content-wrapper17485-broadcast-msgAnnabel Dunstone2016-05-121-1/+1
| | |
* | | Merge branch 'fix_health_check_type' into 'master' Douwe Maan2016-05-122-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix minor typos in admin health check page Fix minor typos from gitlab-org/gitlab-ce!3888 cc/ @DouweM @twk3 See merge request !4134
| * | | Fix minor typos in admin health check pageDrew Blessing2016-05-122-2/+2
| | | |
* | | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' Douwe Maan2016-05-121-47/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up EventsHelper spec Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4133
| * | | | Clean up EventsHelper specRobert Speicher2016-05-121-47/+48
| | | | |
* | | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-1210-14/+14
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
| * | | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-0810-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
* | | | | Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-125-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a description for default scope on builds Should be "**All* builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118
| * | | | | Fix a description for default scope on buildsTakuya Noguchi2016-05-135-2/+5
| | | | | |
* | | | | | Merge branch 'feature/label-subscription-api' into 'master' Douwe Maan2016-05-1213-77/+261
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoints for un/subscribing from/to a label See merge request !4051
| * | | | | | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-1213-77/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15638
* | | | | | | Merge branch 'health-check-route'Douwe Maan2016-05-1217-1/+292
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | Add Changelog entryhealth-check-routeDJ Mountney2016-05-123-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
View Lorry Controller Status