summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add descriptions for the RSpec/EmptyExampleGroup and RSpec/ExpectOutput copsadd-cop-descriptionsRémy Coutable2017-05-191-1/+2
* 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 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 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 treedm-render-plain-readmeDouwe Maan2017-05-182-8/+10
* | | Merge branch 'user-avatar-vue-ce' into 'master'Phil Hughes2017-05-1926-78/+449
|\ \ \ | |_|/ |/| |
| * | 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 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 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 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 oauthCindy Pallares 🦉2017-05-181-2/+44
* | | | | Merge branch 'delete-old-mr-widget' into 'master'Fatih Acet2017-05-181-303/+0
|\ \ \ \ \
| * | | | | 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 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 READMEsToon Claes2017-05-182-0/+15
| | |/ / / | |/| | |
* | | | | Merge branch 'bvl-fix-incorrectly-renamed-routes' into 'master'Douwe Maan2017-05-185-2/+51
|\ \ \ \ \
| * | | | | 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 coprubocop-empty-example-groupRémy Coutable2017-05-186-37/+33
* | | | | | Merge branch 'rubocop-expect-output' into 'master'Robert Speicher2017-05-184-18/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Enable the RSpec/ExpectOutput coprubocop-expect-outputRémy Coutable2017-05-184-18/+15
* | | | | | Merge branch 'remove-services-count-from-usage-ping-data' into 'master'Stan Hu2017-05-182-2/+0
|\ \ \ \ \ \
| * | | | | | Remove Services count from usage ping payload.Ruben Davila2017-05-182-2/+0
| |/ / / / /
* | | | | | Merge branch '32425-fix-diff-notes-instant-editing' into 'master'Phil Hughes2017-05-182-3/+44
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 (!11284)winh-testing-promiseswinh2017-05-171-0/+62
* | | | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-1823-7/+449
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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 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
|\ \ \ \ \ \
| * | | | | | Reworddocs-apiv3-removal-msgDrew Blessing2017-05-181-3/+3
| * | | | | | Match v3 caseDrew Blessing2017-05-181-1/+1
| * | | | | | Make API v3 removal date more clear/match blog postDrew Blessing2017-05-181-1/+3
* | | | | | | Merge branch 'change-url-in-specific-runners-registration-steps' into 'master'Kamil Trzciński2017-05-184-10/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove references to '/ci' path while describing Runner's registrationchange-url-in-specific-runners-registration-stepsTomasz Maczukin2017-05-154-10/+10
* | | | | | | Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-183-5/+15
|\ \ \ \ \ \ \
| * | | | | | | Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843Douwe Maan2017-05-182-5/+3
View Lorry Controller Status