summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add GitLab cluster id to jupyter configdz-expose-cluster-id-to-jupyterDmitriy Zaporozhets2018-09-182-0/+12
* Merge branch 'rs-have_link-arguments' into 'master'Douwe Maan2018-09-182-5/+5
|\
| * Correct usage of the have_link matcherRobert Speicher2018-09-142-5/+5
* | Merge branch '45754-open-issues-from-archived-project-listed-in-group-issue-b...Douwe Maan2018-09-186-4/+55
|\ \
| * | Filter out archived projects from issue/mr countBrett Walker2018-09-174-2/+40
| * | Filter out archived issues from group issue boardBrett Walker2018-09-142-2/+15
* | | Merge branch 'update-contribution-guideline' into 'master'Douwe Maan2018-09-181-1/+1
|\ \ \
| * | | Resolve character encodings in CONTRIBUTINGAndreas Kämmerle2018-09-171-1/+1
* | | | Merge branch '51273-expose-runners-for-build-in-job-api' into 'master'Kamil Trzciński2018-09-187-7/+88
|\ \ \ \
| * | | | Expose runners status information in job apiSteve Azzopardi2018-09-187-7/+88
|/ / / /
* | | | Merge branch 'sh-fix-commit-email-migration' into 'master'Nick Thomas2018-09-181-1/+1
|\ \ \ \
| * | | | Return a default commit email if migration has not completedStan Hu2018-09-151-1/+1
* | | | | Merge branch 'ml-fix-initial-admin-password' into 'master'Robert Speicher2018-09-171-0/+2
|\ \ \ \ \
| * | | | | Fix: set initial password even if using admin credentialsMark Lapierre2018-09-171-0/+2
* | | | | | Merge branch 'ml-qa-spec-use-ssh-key' into 'master'Robert Speicher2018-09-1715-18/+233
|\ \ \ \ \ \
| * | | | | | Add an SSH key and use it to clone and pushMark Lapierre2018-09-1515-18/+233
* | | | | | | Merge branch 'rs-fix-2fa-codes-lint' into 'master'Douglas Barbosa Alexandre2018-09-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix haml-lint error in 2FA codes partialRobert Speicher2018-09-171-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix-url-validator' into 'master'Douglas Barbosa Alexandre2018-09-172-3/+26
|\ \ \ \ \ \ \
| * | | | | | | Allow UrlValidator to work with attr_encryptedNick Thomas2018-09-172-3/+26
* | | | | | | | Merge branch 'rails5-commonmaker' into 'master'Robert Speicher2018-09-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Sync commonmaker version in Gemfile.*.lockJan Provaznik2018-09-171-1/+1
* | | | | | | | | Merge branch 'rs-markdown-feature-parity' into 'master'Douglas Barbosa Alexandre2018-09-171-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add fixture path argument to `MarkdownFeature.new`Robert Speicher2018-09-141-1/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'select-from-union' into 'master'Robert Speicher2018-09-1729-95/+240
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Added FromUnion to easily select from a UNIONYorick Peterse2018-09-1729-95/+240
* | | | | | | | | Merge branch 'osw-gitaly-diff-stats-client' into 'master'Douwe Maan2018-09-176-0/+85
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Gitaly diff stats RPC clientOswaldo Ferreira2018-09-176-0/+85
* | | | | | | | | | Merge branch 'junit-reports-filename-patterns' into 'master'Achilleas Pipinellis2018-09-171-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | MR feedback: Remove now-redundant linkPatrick Lehner2018-09-161-1/+1
| * | | | | | | | | | Extend JUnit XML test report documentation to explicitly mention support for ...Patrick Lehner2018-09-081-3/+6
* | | | | | | | | | | Merge branch 'decouple-file-row-from-ide' into 'master'Filipa Lacerda2018-09-178-471/+602
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Decouple file row from IDEPhil Hughes2018-09-178-471/+602
* | | | | | | | | | | | Merge branch 'add-2fa-button' into 'master'Annabel Dunstone Gray2018-09-173-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add 2fa buttonLuke Picciau2018-09-173-1/+12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'update-community-contribution-guidelines' into 'master'Mek Stittri2018-09-171-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update CONTRIBUTING.mdAndreas Kämmerle2018-09-151-1/+0
| * | | | | | | | | | | | Update CONTRIBUTING via new community contribution flowAndreas Kämmerle2018-09-151-4/+5
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '51093-add-runner-json-schema-and-factory' into 'master'Kamil Trzciński2018-09-174-3/+83
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add runner JSON schemaSteve Azzopardi2018-09-174-3/+83
* | | | | | | | | | | | Merge branch 'leipert-backport-ee-changes' into 'master'Phil Hughes2018-09-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Backport EE changes to `app/assets/javascripts/filtered_search/issuable_filte...Lukas Eipert2018-09-171-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '50956-web-terminal' into 'master'Phil Hughes2018-09-172-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Include correct CSS file for xterm in environments pageFilipa Lacerda2018-09-172-1/+6
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '44596-double-title-merge-request-message' into 'master'Grzegorz Bizon2018-09-173-5/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add fix for EE merge messageKukovskii Vladimir2018-09-142-2/+7
| * | | | | | | | | | Fix double title in merge request chat messagesKukovskii Vladimir2018-09-113-5/+10
* | | | | | | | | | | Merge branch '50944-unable-to-import-repository-undefined-method-import_file-...Douwe Maan2018-09-175-4/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Resolve "Unable to import repository: undefined method `import_file' for nil...James Lopez2018-09-175-4/+15
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-setup-grammar-3-ce' into 'master'Douwe Maan2018-09-1731-44/+44
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |