summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bootstrap4Clement Ho2018-05-2320-159/+904
|\
| * Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-234-102/+209
| |\
| | * Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributesRémy Coutable2018-05-231-50/+51
| | * Use the new CacheableAttributes concern in the ApplicationSetting and Appeara...Rémy Coutable2018-05-232-52/+5
| | * Introduce a new CacheableAttributes concernRémy Coutable2018-05-231-0/+153
| * | Merge branch 'fix/devops-remove-beta' into 'master'Tim Zallmann2018-05-231-1/+1
| |\ \
| | * | removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-betaPaul Slaughter2018-05-211-1/+1
| * | | Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'Rémy Coutable2018-05-231-1/+1
| |\ \ \
| | * | | Update Prometheus URL spec for 1.10 formatJoshua Lambert2018-05-221-1/+1
| * | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-231-25/+48
| | |_|/ | |/| |
| * | | Merge branch 'issue-25256' into 'master'Douwe Maan2018-05-233-2/+55
| |\ \ \
| | * | | skip email trim when email is creating new issueCameron Crockett2018-05-223-2/+55
| * | | | Resolve "Deprecate Gemnasium project service"Olivier Gonzalez2018-05-232-24/+29
| * | | | Resolve "Web IDE doesn't work for branches with slashes"Tim Zallmann2018-05-231-2/+8
| * | | | Merge branch 'ide-commit-state-bug' into 'master'Filipa Lacerda2018-05-231-0/+20
| |\ \ \ \
| | * | | | fixed specPhil Hughes2018-05-231-0/+1
| | * | | | added specide-commit-state-bugPhil Hughes2018-05-221-0/+19
| * | | | | Merge branch 'ide-jobs-list' into 'master'Filipa Lacerda2018-05-235-2/+527
| |\ \ \ \ \
| | * | | | | group jobs into stageside-jobs-listPhil Hughes2018-05-224-13/+128
| | * | | | | added getter for checking is their is a pipelinePhil Hughes2018-05-222-1/+47
| | * | | | | Show CI jobs in web IDEPhil Hughes2018-05-224-2/+366
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'ide-file-finder-improve-order' into 'master'Filipa Lacerda2018-05-231-0/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | changed what bit of code stops the callbackide-file-finder-improve-orderPhil Hughes2018-05-221-0/+6
* | | | | | Merge branch 'master' into bootstrap4Clement Ho2018-05-2216-63/+372
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '44895-explicit-merge-conflict' into 'master'Tim Zallmann2018-05-221-3/+3
| |\ \ \ \ \
| | * | | | | Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-3/+3
| * | | | | | Merge branch 'dm-xcode-project-directory' into 'master'Robert Speicher2018-05-221-7/+7
| |\ \ \ \ \ \
| | * | | | | | Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directoryDouwe Maan2018-05-221-7/+7
| * | | | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-222-33/+82
| |\ \ \ \ \ \ \
| | * | | | | | | Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmedRémy Coutable2018-05-222-33/+82
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'ce-6114-move-some-features-projects-specs' into 'master'Rémy Coutable2018-05-221-0/+18
| |\ \ \ \ \ \ \
| | * | | | | | | Unify spec/features/projects/blobs/blob_show_spec.rbLin Jen-Shin2018-05-221-0/+18
| | |/ / / / / /
| * | | | | | | Merge branch 'ab-42194-keyset-pagination' into 'master'Yorick Peterse2018-05-221-8/+204
| |\ \ \ \ \ \ \
| | * | | | | | | Add keyset pagination for API calls.Andreas Brandl2018-05-211-8/+204
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Expose readme url in Project APIImre Farkas2018-05-225-4/+34
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'rename-merge-request-widget-author-component' into 'master'Phil Hughes2018-05-221-3/+3
| |\ \ \ \ \ \
| | * | | | | | Rename merge request widget author componentGeorge Tsiolis2018-05-221-3/+3
| * | | | | | | Fix `expose_url` helper does not include custom base url if it is setFrancisco Javier López2018-05-221-2/+14
| | |_|_|/ / / | |/| | | | |
| * | | | | | Renamed 'Overview' to 'Project' in collapsed contextual navigation at a proje...Constance Okoghenun2018-05-212-3/+3
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into ...Nick Thomas2018-05-211-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Adding progressbar explicitly and spec extensions for itce-5928-geo-rake-task-to-force-housekeeping-on-next-syncGabriel Mazetto2018-05-101-0/+4
* | | | | | Remove code from bad mergeClement Ho2018-05-221-98/+0
* | | | | | Merge branch 'master' into bootstrap4Clement Ho2018-05-2155-540/+1494
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master'Kamil Trzciński2018-05-211-0/+16
| |\ \ \ \ \
| | * | | | | Add test for the cancelled jobsShinya Maeda2018-05-211-0/+16
| * | | | | | Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ...Grzegorz Bizon2018-05-213-3/+57
| |\ \ \ \ \ \
| | * | | | | | Fix Rubocop offense in create pipeline services :cop:fix/gb/exclude-persisted-variables-from-environment-nameGrzegorz Bizon2018-05-211-1/+2
| | * | | | | | Update pipeline persisted / predefined variables specsGrzegorz Bizon2018-05-182-4/+8
| | * | | | | | Separate persisted and runtime pipeline variablesGrzegorz Bizon2018-05-182-1/+28
| | * | | | | | Do not allow to use `CI_PIPELINE_ID` in environment nameGrzegorz Bizon2018-05-181-0/+22
View Lorry Controller Status