summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Place z-index in same place as z-index on EE in header.scssfix-header-z-indexLuke "Jared" Bennett2017-05-191-1/+1
|
* Replaced duplicate z-index with index of 400Luke "Jared" Bennett2017-05-191-2/+1
|
* Merge branch 'zj-increase-accuracy-ps' into 'master'Kamil Trzciński2017-05-191-1/+1
|\ | | | | | | | | Run the schedule worker once an hour by default See merge request !11476
| * Run the schedule worker once an hour by defaultzj-increase-accuracy-psZ.J. van de Weg2017-05-181-1/+1
| | | | | | | | [ci skip]
* | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
|\ \ | | | | | | | | | | | | | | | | | | Add refresh button into MR widget failed state. Closes #32543 See merge request !11519
| * | MRWidget: Make error message bold and red.mr-widget-refresh-failedFatih Acet2017-05-191-1/+1
| | |
| * | MRWidget: Change refresh button place in failed state.Fatih Acet2017-05-191-3/+3
| | |
| * | MRWidget: Add refresh button into MR widget failed state.Fatih Acet2017-05-191-0/+26
| | |
* | | Merge branch 'fix/allow-accessing-appearance-images' into 'master'32603-add-docs-prometheus-sparkline-displayed-in-mrRémy Coutable2017-05-193-0/+46
|\ \ \ | | | | | | | | | | | | | | | | Fixes the 500 for custom apearance header logo and logo See merge request !11479
| * | | Fixes the 500 for custom apearance header logo and logoAlexis Reigel2017-05-193-0/+46
|/ / /
* | | Merge branch 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-195-46/+15
|\ \ \ | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425
| * | | Remove readme project_view optionDouwe Maan2017-05-195-46/+15
| | | |
* | | | Merge branch 'dm-render-plain-readme' into 'master'Rémy Coutable2017-05-192-8/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Render plain README using Markup viewer so it is displayed below tree See merge request !11510
| * | | | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readmeDouwe Maan2017-05-182-8/+10
| | | | |
* | | | | Merge branch 'user-avatar-vue-ce' into 'master'Phil Hughes2017-05-1926-78/+449
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718
| * | | | Add s selectors for supported avatars.user-avatar-vue-ceBryce Johnson2017-05-181-0/+2
| | | | |
| * | | | Fixes per feedback on user avatar components.Bryce Johnson2017-05-187-92/+26
| | | | |
| * | | | Consolidate user avatar Vue logicBryce Johnson2017-05-1827-78/+513
| | | | |
* | | | | Merge branch 'fix-js-translations' into 'master'Phil Hughes2017-05-196-11/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix JavaScript translations that are using a namespace See merge request !11522
| * | | | Fix JavaScript translations that are using a namespacefix-js-translationsRuben Davila2017-05-186-11/+11
|/ / / /
* | | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'Robert Speicher2017-05-184-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop MR conflict code from blowing up when branches are missing Closes #32544 See merge request !11501
| * | | | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-184-1/+11
| | | | |
* | | | | Merge branch 'dm-catch-uri-errors' into 'master'Robert Speicher2017-05-183-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch all URI errors in ExternalLinkFilter Closes #32076 See merge request !11494
| * | | | | Catch all URI errors in ExternalLinkFilterdm-catch-uri-errorsDouwe Maan2017-05-183-1/+12
| |/ / / /
* | | | | Merge branch 'github-oauth-self-signed-certs-troubleshooting-docs' into 'master'Robert Speicher2017-05-181-2/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add docs on how to turn off SSL verification on GH oauth See merge request !11504
| * | | | | Add docs on how to turn off SSL verification on GH oauthCindy Pallares 🦉2017-05-181-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/323/ we added support to disable SSL verification because attempting to import projects from a self-signed GH Enterprise instance will fail with an SSL error.
* | | | | | Merge branch 'delete-old-mr-widget' into 'master'Fatih Acet2017-05-181-303/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete merge_request_widget.js See merge request !11452
| * | | | | | Delete merge_request_widget.jsdelete-old-mr-widgetLuke "Jared" Bennett2017-05-171-303/+0
| | | | | | |
* | | | | | | Merge branch 'disable-clicking-disabled-clipboard-button' into 'master'Phil Hughes2017-05-182-6/+29
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clicking disabled clipboard button toolip Closes #32518 See merge request !11493
| * | | | | | Fix clicking disabled clipboard button toolipLuke "Jared" Bennett2017-05-182-6/+29
|/ / / / / /
* | | | | | Merge branch 'tc-fix-broken-plain-readme' into 'master'Douwe Maan2017-05-182-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ProjectCacheWorker for plain READMEs Closes #32540 See merge request !11506
| * | | | | | Fix ProjectCacheWorker for plain READMEsToon Claes2017-05-182-0/+15
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ProjectCacheWorker refreshes cache periodically, but it runs outside Rails context. So include the ActionView helpers so the `content_tag` method is available.
* | | | | | Merge branch 'bvl-fix-incorrectly-renamed-routes' into 'master'Douwe Maan2017-05-185-2/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for the rename reserved paths helpers Closes #32528 See merge request !11492
| * | | | | | Fixes for the rename reserved paths helpersBob Van Landuyt2017-05-185-2/+51
|/ / / / / /
* | | | | | Merge branch 'rubocop-empty-example-group' into 'master'Robert Speicher2017-05-186-37/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the RSpec/EmptyExampleGroup cop See merge request !11497
| * | | | | | Enable the RSpec/EmptyExampleGroup coprubocop-empty-example-groupRémy Coutable2017-05-186-37/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'rubocop-expect-output' into 'master'Robert Speicher2017-05-184-18/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Enable the RSpec/ExpectOutput cop See merge request !11500
| * | | | | | Enable the RSpec/ExpectOutput coprubocop-expect-outputRémy Coutable2017-05-184-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'remove-services-count-from-usage-ping-data' into 'master'Stan Hu2017-05-182-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Services count from usage ping payload. Closes gitlab-ee#2241 See merge request !11499
| * | | | | | | Remove Services count from usage ping payload.Ruben Davila2017-05-182-2/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This query was timing out and is blocking the sync of usage data for GitLab.com
* | | | | | | Merge branch '32425-fix-diff-notes-instant-editing' into 'master'Phil Hughes2017-05-182-3/+44
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ability to edit diff notes multiple times Closes #32425 See merge request !11456
| * | | | | | Fix ability to edit diff notes multiple timesKushal Pandya2017-05-182-3/+44
|/ / / / / /
* | | | | | Merge branch 'winh-testing-promises' into 'master'Clement Ho2017-05-181-0/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Document Promise testing best practice See merge request !11284
| * | | | | Document Promise testing best practice (!11284)winh-testing-promiseswinh2017-05-171-0/+62
| | | | | |
* | | | | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-1823-7/+449
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | See merge request !11346.
| * | | | | Fix inaccurate code commentdm-gemfile-viewerDouwe Maan2017-05-181-1/+1
| | | | | |
| * | | | | Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-1723-7/+449
| | | | | |
* | | | | | Merge branch 'fix-trailing-space-mr-widget' into 'master'Fatih Acet2017-05-182-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463
| * | | | | | Refactored the anchor tag to remove the trailing space in the target branchfix-trailing-space-mr-widgetJose Ivan Vargas2017-05-172-4/+5
| | | | | | |
* | | | | | | Merge branch 'docs-apiv3-removal-msg' into 'master'Douwe Maan2017-05-181-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make API v3 removal date more clear/match blog post See merge request !11482