summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix testfix/sm/40478-gcp_clusters_migration_culprit-1Shinya Maeda2017-11-242-16/+17
* Follow up cluster_id recovery for Platform::KubernetesShinya Maeda2017-11-242-0/+153
* Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-2315-36/+51
|\
| * Fix link text from group contextJarka Kadlecova2017-11-2315-36/+51
* | Merge branch 'feature/disable-password-authentication' into 'master'Douwe Maan2017-11-2352-110/+299
|\ \
| * | Allow password authentication to be disabled entirelyMarkus Koller2017-11-2352-110/+299
|/ /
* | Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master'Kamil Trzciński2017-11-231-1/+0
|\ \
| * | Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_ar...Shinya Maeda2017-11-231-1/+0
* | | Merge branch 'docs/cross-link-default-branch' into 'master'Marcia Ramos2017-11-231-2/+3
|\ \ \
| * | | Cross link default branch docs to issue closing pattern docsdocs/cross-link-default-branchAchilleas Pipinellis2017-11-221-2/+3
* | | | Merge branch 'docs/redirect-fix' into 'master'Marcia Ramos2017-11-239-13/+11
|\ \ \ \
| * | | | Fix the redirect location wordingAchilleas Pipinellis2017-11-239-13/+11
| |/ / /
* | | | Merge branch 'tz-update-vue-libraries' into 'master'Phil Hughes2017-11-232-79/+70
|\ \ \ \
| * | | | Updated all Vue librariestz-update-vue-librariesTim Zallmann2017-11-232-79/+70
* | | | | Merge branch '32098-environments-reusable' into 'master'Phil Hughes2017-11-2332-804/+933
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Improve environments performanceFilipa Lacerda2017-11-2332-804/+933
|/ / / /
* | | | Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'Sean McGivern2017-11-231-6/+6
|\ \ \ \
| * | | | In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedlyRémy Coutable2017-11-231-4/+4
| * | | | Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable2017-11-221-1/+1
| * | | | Try to always find the merge base using `origin/#{branch}` instead of just `#...Rémy Coutable2017-11-221-1/+1
* | | | | Merge branch 'git-user-encoding' into 'master'Rémy Coutable2017-11-235-8/+32
|\ \ \ \ \
| * | | | | Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)2017-11-235-8/+32
|/ / / / /
* | | | | Merge branch 'fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute...Kamil Trzciński2017-11-233-13/+26
|\ \ \ \ \
| * | | | | Add change logShinya Maeda2017-11-231-0/+6
| * | | | | Fix testing orderShinya Maeda2017-11-231-1/+1
| * | | | | Add a testShinya Maeda2017-11-231-12/+19
| * | | | | Avoid deactivation when pipeline schedules execute a commit includes `[ci skip]`Shinya Maeda2017-11-231-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'feature/sm/40147-add-environment_scope-to-cluster-table' into '...Kamil Trzciński2017-11-232-0/+16
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add environment_scope to cluster tableShinya Maeda2017-11-222-0/+16
| |/ / /
* | | | Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' in...Filipa Lacerda2017-11-231-0/+4
|\ \ \ \
| * | | | Add CSS hidden class in mailer layout39653-hide-section_start-and-section_end-in-pipeline-emailsAlessio Caiazza2017-11-221-0/+4
| |/ / /
* | | | Merge branch '40445-upgrade-fe-babel-libraries' into 'master'Filipa Lacerda2017-11-232-315/+490
|\ \ \ \
| * | | | Upgraded babel related libraries40445-upgrade-fe-babel-librariesTim Zallmann2017-11-222-315/+490
* | | | | Merge branch 'jivl-general-icons' into 'master'Tim Zallmann2017-11-234-10/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Change star, filter and settings icons to the their sprite based replacementsJose Ivan Vargas Lopez2017-11-234-10/+15
|/ / / /
* | | | Update CHANGELOG.md for 10.2.1Michael Kozono2017-11-222-5/+7
* | | | Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable2017-11-226-23/+19
|\ \ \ \
| * | | | Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-226-23/+19
| | |_|/ | |/| |
* | | | Merge branch '28377-add-edit-button-to-mobile-file-view' into 'master'Clement Ho2017-11-224-1/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | Add edit button to mobile file viewTravis Miller2017-11-224-1/+30
* | | | Merge branch '40283-fix-missing-mr-widget-status-icons' into 'master'Tim Zallmann2017-11-221-1/+1
|\ \ \ \
| * | | | Fix missing MR widget status icons40283-fix-missing-mr-widget-status-iconsEric Eastwood2017-11-221-1/+1
* | | | | Merge branch '40444-upgrade-axios-from-0-16-2-to-0-17-1' into 'master'Filipa Lacerda2017-11-222-10/+16
|\ \ \ \ \
| * | | | | Updated axios40444-upgrade-axios-from-0-16-2-to-0-17-1Tim Zallmann2017-11-222-10/+16
* | | | | | Merge branch 'pawel/disable_prometheus_metrics' into 'master'Stan Hu2017-11-222-3/+8
|\ \ \ \ \ \
| * | | | | | Force disable Prometheus metricsPawel Chojnacki2017-11-222-3/+8
* | | | | | | Merge branch 'jivl-replace-vue-resource-prometheus-dashboard' into 'master'Filipa Lacerda2017-11-223-26/+14
|\ \ \ \ \ \ \
| * | | | | | | Replaced vue-resource for axios in the prometheus dashboardjivl-replace-vue-resource-prometheus-dashboardJose Ivan Vargas2017-11-223-26/+14
* | | | | | | | Merge branch '38877-disable-autocomplete-in-filtered-search' into 'master'Clement Ho2017-11-223-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Disables autocomplete in filtered searchJacopo2017-11-203-1/+11
View Lorry Controller Status