summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requestsOswaldo Ferreira2017-05-22123-524/+471
* Merge branch 'fix-retried-for-mysql' into 'master'Timothy Andrew2017-05-222-3/+43
|\
| * Respect the typo as rubocop saidLin Jen-Shin2017-05-221-0/+0
| * Add a test to ensure this works on MySQLLin Jen-Shin2017-05-221-0/+17
| * Fixes broken MySQL migration for retriedKamil Trzcinski2017-05-221-3/+26
* | Merge branch 'docs/deploys-perf-dashboard' into 'master'Sean Packham (GitLab)2017-05-224-12/+49
|\ \
| * | Move environment monitoring to environments docdocs/deploys-perf-dashboardAchilleas Pipinellis2017-05-214-12/+49
* | | Merge branch 'doc-hostname-fix' into 'master'Sean Packham (GitLab)2017-05-221-1/+1
|\ \ \ | |_|/ |/| |
| * | change domain to hostname in usage ping docJob van der Voort2017-05-221-1/+1
|/ /
* | Merge branch '31510-mask-password-field-edit' into 'master'Phil Hughes2017-05-223-3/+7
|\ \
| * | Show password field mask while editing service settingsKushal Pandya2017-05-223-3/+7
|/ /
* | Merge branch '32496-admin-tabs' into 'master'Phil Hughes2017-05-221-35/+36
|\ \
| * | Fix admin tabs32496-admin-tabsAnnabel Dunstone Gray2017-05-181-35/+36
* | | Merge branch '32667-update-helm-chart-documentation' into 'master'Achilleas Pipinellis2017-05-221-0/+2
|\ \ \ | |_|/ |/| |
| * | Add notes for supported schedulers and cloud providers32667-update-helm-chart-documentationJoshua Lambert2017-05-221-0/+2
|/ /
* | Merge branch '32604-add-docs-for-change-of-cache-artifact-restore-order' into...Achilleas Pipinellis2017-05-211-1/+7
|\ \
| * | Add docs for change of Cache/Artifact restore order"Sean Packham (GitLab)2017-05-211-1/+7
|/ /
* | Merge branch '32462-award-emoji-tooltip-should-be-add-reaction' into 'master'Annabel Dunstone Gray2017-05-213-4/+4
|\ \
| * | rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate32462-award-emoji-tooltip-should-be-add-reactionMike Greiling2017-05-193-4/+4
* | | Merge branch 'zj-pipeline-json-performance' into 'master'Kamil Trzciński2017-05-211-5/+33
|\ \ \
| * | | Improve pipeline size for query limit testzj-pipeline-json-performanceZ.J. van de Weg2017-05-171-5/+33
* | | | Merge branch 'fix/gb/exclude-manual-actions-from-cancelable-jobs' into 'master'Kamil Trzciński2017-05-213-1/+15
|\ \ \ \
| * | | | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-193-1/+15
* | | | | Merge branch 'docs/issues-multiple-assignees' into 'master'Sean Packham (GitLab)2017-05-206-11/+25
|\ \ \ \ \
| * | | | | Add to docs: issues multiple assigneesMarcia Ramos2017-05-206-11/+25
* | | | | | Merge branch 'docs/add-comment-snippets' into 'master'Sean Packham (GitLab)2017-05-202-0/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | adds "comments on snippets" to docdocs/add-comment-snippetsMarcia Ramos2017-05-192-0/+10
| |/ / / /
* | | | | Merge branch 'bvl-fix-already-renamed-paths' into 'master'Douwe Maan2017-05-195-1/+250
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Rename users on mysqlbvl-fix-already-renamed-pathsBob Van Landuyt2017-05-191-4/+15
| * | | | Don't try to rename `-`Bob Van Landuyt2017-05-191-1/+0
| * | | | Simpler way of renaming usersBob Van Landuyt2017-05-192-10/+10
| * | | | Fix incorrectly renamed routesBob Van Landuyt2017-05-193-1/+178
| * | | | Rename users that had their namespace renamedBob Van Landuyt2017-05-193-1/+63
| | |_|/ | |/| |
* | | | Merge branch 'winh-frontend-api-users' into 'master'Clement Ho2017-05-1913-114/+419
|\ \ \ \
| * | | | Add users endpoint to frontend API classWinnie Hellmann2017-05-1913-114/+419
|/ / / /
* | | | Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-192-1/+30
|\ \ \ \
| * | | | Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-192-1/+30
| | |/ / | |/| |
* | | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-1912-28/+27
|\ \ \ \
| * | | | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvementsOswaldo Ferreira2017-05-191-1/+4
| * | | | Remove routeOswaldo Ferreira2017-05-193-12/+0
| * | | | Fix Karma expectOswaldo Ferreira2017-05-181-1/+0
| * | | | Stop loading MergeRequestEntity data on sidebar requestOswaldo Ferreira2017-05-185-4/+4
| * | | | Remove unnecessary initial requestOswaldo Ferreira2017-05-182-2/+0
| * | | | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-183-9/+20
| | |/ / | |/| |
* | | | Merge branch 'winh-dropdown-ajax-cache' into 'master'Clement Ho2017-05-191-28/+6
|\ \ \ \
| * | | | Use AjaxCache in Droplab Ajax plugin (!11171)winh-dropdown-ajax-cachewinh2017-05-181-28/+6
* | | | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-1912-313/+645
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-1910-22/+272
| * | | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-184-317/+386
| * | | | Add test that fails without the fixMichael Kozono2017-05-181-0/+13