summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5779_rename_code_quality_job_and_artifact' into 'master'Achilleas Pipinellis2018-05-241-1/+1
|\
| * Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779Olivier Gonzalez2018-05-231-1/+1
* | Fix backup creation and restore for specific Rake tasksStan Hu2018-05-243-6/+17
* | Merge branch 'ce-jej/saml-failure-messages' into 'master'Grzegorz Bizon2018-05-242-0/+15
|\ \
| * | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messagesJames Edwards-Jones2018-05-212-0/+15
* | | Merge branch 'fl-loading-icon' into 'master'Phil Hughes2018-05-241-1/+10
|\ \ \
| * | | Show loading icon only when making the requestfl-loading-iconFilipa Lacerda2018-05-231-1/+10
* | | | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-2410-60/+238
|\ \ \ \
| * | | | Add specMark Chao2018-05-241-22/+34
| * | | | Plural reason(s)Mark Chao2018-05-181-0/+1
| * | | | Create TODO when MR became unmergeablelulalala2018-05-172-34/+17
| * | | | Notify with email when merge request became unmergeablelulalala2018-05-173-0/+100
| * | | | Add MergeRequest#merge_participantslulalala2018-05-171-0/+35
| * | | | Add cannot_be_merged_recheck merge_statuslulalala2018-05-175-4/+51
* | | | | Merge branch 'jprovazn-fix-resolvable' into 'master'Douwe Maan2018-05-241-0/+8
|\ \ \ \ \
| * | | | | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvableJan Provaznik2018-05-231-0/+8
* | | | | | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'Mike Greiling2018-05-241-0/+24
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Closes MR check out branch modal with escapeJacopo2018-05-221-0/+24
* | | | | | 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 '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
| | |_|_|_|_|/ / / / | |/| | | | | | | |
View Lorry Controller Status