summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tz-prettier-base' into 'master'42027-hide-hover-data-in-performance-dashboard-legendFilipa Lacerda2018-03-149-14/+214
|\
| * Prettier Phase 1: Prettier Configuration, Prettifying of files and documentationTim Zallmann2018-03-149-14/+214
|/
* Merge branch 'ci-lint-dispatcher-fix' into 'master'Filipa Lacerda2018-03-142-0/+1
|\
| * add check for ace editor on create routeci-lint-dispatcher-fixPhil Hughes2018-03-141-0/+1
| * Change path of CI lints create index.js filePhil Hughes2018-03-141-0/+0
* | Merge branch 'update-net-ssh' into 'master'Douwe Maan2018-03-142-3/+3
|\ \
| * | Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734)Pirate Praveen2018-03-142-3/+3
* | | Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'Robert Speicher2018-03-143-10/+15
|\ \ \
| * | | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0Takuya Noguchi2018-03-143-10/+15
* | | | Merge branch 'update-fog-aws' into 'master'Robert Speicher2018-03-142-6/+6
|\ \ \ \
| * | | | update fog-aws 1.4 -> 2.0Pirate Praveen2018-03-132-6/+6
* | | | | Merge branch 'update-acts-as-taggable-on' into 'master'Robert Speicher2018-03-142-6/+6
|\ \ \ \ \
| * | | | | Update acts-as-taggable-on to 5.0Pirate Praveen2018-03-122-6/+6
* | | | | | Merge branch 'update-sentry-raven' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ \ \ \
| * | | | | | Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029)Pirate Praveen2018-03-132-3/+3
| |/ / / / /
* | | | | | Merge branch 'update-octokit' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ \ \ \
| * | | | | | Update octokit 4.6.2 -> 4.8Pirate Praveen2018-03-142-3/+3
* | | | | | | Merge branch 'update-ruby-prof' into 'master'Robert Speicher2018-03-142-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update ruby-prof 0.16.2 -> 0.17.0Pirate Praveen2018-03-132-3/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'update-httparty' into 'master'Grzegorz Bizon2018-03-142-4/+3
|\ \ \ \ \ \
| * | | | | | Update httparty 0.13.3 -> 0.15.6Pirate Praveen2018-03-142-4/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bvl-import-zip-multiple-assignees' into 'master'Sean McGivern2018-03-144-15/+42
|\ \ \ \ \ \
| * | | | | | Import multiple issue assignees from GitLab exportBob Van Landuyt2018-03-144-15/+42
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '43717-breadcrumb-on-admin-runner-page' into 'master'Sean McGivern2018-03-142-0/+9
|\ \ \ \ \ \
| * | | | | | Set breadcrumb for admin/runners/showTakuya Noguchi2018-03-142-0/+9
* | | | | | | Merge branch '44160-update-foreman-to-0.84.0' into 'master'Grzegorz Bizon2018-03-143-3/+8
|\ \ \ \ \ \ \
| * | | | | | | Update foreman from 0.78.0 to 0.84.0Takuya Noguchi2018-03-133-3/+8
* | | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2018-03-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Docs: Incoming e-mails: require gitlab-ctl restartDamian Nowak2018-03-061-0/+1
* | | | | | | | | Merge branch 'mr-widget-deployment-styling' into 'master'Filipa Lacerda2018-03-149-345/+393
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed deployment rspecmr-widget-deployment-stylingPhil Hughes2018-03-141-1/+1
| * | | | | | | | | removed useless v-ifPhil Hughes2018-03-145-55/+17
| * | | | | | | | | improved markupPhil Hughes2018-03-131-24/+20
| * | | | | | | | | fixed breakpointPhil Hughes2018-03-132-46/+62
| * | | | | | | | | fixed scss-lintPhil Hughes2018-03-131-4/+2
| * | | | | | | | | fixed eslintPhil Hughes2018-03-132-11/+2
| * | | | | | | | | adjust styling to remove gapsPhil Hughes2018-03-131-1/+21
| * | | | | | | | | updated specsPhil Hughes2018-03-134-198/+221
| * | | | | | | | | Fix styling of multiple environments in merge request widgetPhil Hughes2018-03-135-120/+162
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-create-repo-opt-out' into 'master'Sean McGivern2018-03-1413-30/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set Gitlab::Shell#create_repository as OPT_OUTZeger-Jan van de Weg2018-03-141-4/+5
| * | | | | | | | | Change Gitlab::Shell#add_namespace to #create_namespaceZeger-Jan van de Weg2018-03-1413-26/+26
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'projects-graphs-rspec' into 'master'Grzegorz Bizon2018-03-143-83/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace project graphs spinach tests with RSpec analogSemyon Pupkov2018-03-143-83/+75
* | | | | | | | | | Merge branch 'project-redirects-rspec' into 'master'Lin Jen-Shin2018-03-143-105/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace project redirects spinach tests with RSpec analogSemyon Pupkov2018-03-143-105/+74
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-emoji-popup' into 'master'Sean McGivern2018-03-142-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hide emoji popup after multiple spaces or blank linesJan Beckmann2018-03-112-2/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'backstage/gb/add-pipeline-build-variables-tests' into 'master'Kamil TrzciƄski2018-03-142-39/+90
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove enforcing uniqueness of build variablesbackstage/gb/add-pipeline-build-variables-testsGrzegorz Bizon2018-03-072-10/+9