summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 24339-job-page24339-job-pageFilipa Lacerda2017-05-19410-2388/+5233
|\
| * Merge branch 'winh-testing-promises-docs' into 'master'Clement Ho2017-05-191-6/+7
| |\
| | * Minor changes to Testing Promises sectionwinh-testing-promises-docspatch-20Winnie Hellmann2017-05-181-6/+7
| * | Merge branch 'patch-21' into 'master'Clement Ho2017-05-191-1/+1
| |\ \
| | * | Update edit.html.hamlpatch-21Fabio Busatto2017-05-181-1/+1
| * | | Merge branch 'fix-header-z-index' into 'master'Annabel Dunstone Gray2017-05-191-2/+1
| |\ \ \
| | * | | Replaced duplicate z-index with index of 400Luke "Jared" Bennett2017-05-191-2/+1
| |/ / /
| * | | Merge branch '31933-improve-rspec-profiling-enabling' into 'master'Stan Hu2017-05-192-2/+2
| |\ \ \
| | * | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enablingRémy Coutable2017-05-192-2/+2
| * | | | Merge branch 'add-cop-descriptions' into 'master'Robert Speicher2017-05-191-1/+2
| |\ \ \ \
| | * | | | Add descriptions for the RSpec/EmptyExampleGroup and RSpec/ExpectOutput copsadd-cop-descriptionsRémy Coutable2017-05-191-1/+2
| | |/ / /
| * | | | Merge branch 'docs/artifacts-preview' into 'master'32612-decide-on-and-document-a-convention-for-passing-context-to-event-handlersSean Packham (GitLab)2017-05-191-0/+4
| |\ \ \ \
| | * | | | Add note about artifacts previewing in docsdocs/artifacts-previewAchilleas Pipinellis2017-05-191-0/+4
| * | | | | Merge branch '32583-update-prometheus-merge-request-widget-documentation' int...Achilleas Pipinellis2017-05-192-3/+7
| |\ \ \ \ \
| | * | | | | Update prometheus documentation32583-update-prometheus-merge-request-widget-documentationJoshua Lambert2017-05-192-3/+7
| * | | | | | Merge branch 'zj-increase-accuracy-ps' into 'master'Kamil Trzciński2017-05-191-1/+1
| |\ \ \ \ \ \
| | * | | | | | Run the schedule worker once an hour by defaultzj-increase-accuracy-psZ.J. van de Weg2017-05-181-1/+1
| * | | | | | | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | 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 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
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |