summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename "Environment {pattern,scope}" in Clusters pagesk8s-env-pattern-scopeAchilleas Pipinellis2017-12-202-2/+2
* Merge branch '41264-gitlab-projects-spec-failures' into 'master'Robert Speicher2017-12-193-10/+9
|\
| * Prevent some specs from mangling the gitlab-shell checkoutNick Thomas2017-12-192-8/+5
| * [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rbValery Sizov2017-12-191-2/+4
* | Merge branch 'fix-onion-skin-reenter' into 'master'Jacob Schatz2017-12-193-13/+35
|\ \
| * | Fix onion-skin re-entering stateClement Ho2017-12-193-13/+35
|/ /
* | Merge branch 'remove-links-mr-empty-state' into 'master'Jacob Schatz2017-12-197-14/+84
|\ \
| * | Remove related links in MR widget when empty stateClement Ho2017-12-197-14/+84
|/ /
* | Merge branch 'show-inline-edit-btn' into 'master'Jacob Schatz2017-12-197-21/+10
|\ \
| * | Show inline edit button for issuesClement Ho2017-12-197-21/+10
|/ /
* | Merge branch '33028-event-tag-links' into 'master'Rémy Coutable2017-12-193-1/+62
|\ \
| * | Fix tags in the Activity tab not being clickableMario de la Ossa2017-12-193-1/+62
|/ /
* | Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-195-4/+81
|\ \
| * | BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-183-7/+14
| * | Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-185-4/+74
* | | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-1914-49/+184
|\ \ \
| * | | Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-1914-49/+184
* | | | Merge branch 'fix-docs-help-shortcut' into 'master'Phil Hughes2017-12-196-4/+53
|\ \ \ \
| * | | | Fix shortcut links on help pageClement Ho2017-12-196-4/+53
|/ / / /
* | | | Merge branch 'fl-update-axios-docs' into 'master'Phil Hughes2017-12-191-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into fl-update-axios-docsFilipa Lacerda2017-12-192-38/+29
| |\ \ \ \
| * | | | | Update axios.mdfl-update-axios-docsFilipa Lacerda2017-12-191-1/+1
* | | | | | Merge branch 'preserve-gem-path' into 'master'Rémy Coutable2017-12-191-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Preserve gem path so that we use the same gemspreserve-gem-pathLin Jen-Shin2017-12-191-1/+2
| |/ / / /
* | | | | Merge branch 'docs/omnibus-2452-tidy-gitlab-application' into 'master'Marin Jankovski2017-12-191-12/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Tidy up the documentation of Gitlab HA/Gitlab ApplicationRichard Clamp2017-12-191-12/+11
|/ / / /
* | | | Merge branch 'except-qa-and-docs' into 'master'Grzegorz Bizon2017-12-191-26/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Make sure two except won't overwrite each otherLin Jen-Shin2017-12-191-26/+18
|/ / /
* | | Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-198-0/+24
|\ \ \
| * | | Inverse the has_multiple_clusters? helper usagefix-cluster-enviroment-missingMatija Čupić2017-12-184-4/+4
| * | | Hardcode clusters helper in CEMatija Čupić2017-12-181-1/+1
| * | | Use helper for feature check in cluster partialsMatija Čupić2017-12-185-2/+15
| * | | Revert save button caption changeMatija Čupić2017-12-161-1/+1
| * | | Add environment scope field to cluster formsMatija Čupić2017-12-164-1/+8
| * | | Allow environment_scope in cluster controllersMatija Čupić2017-12-163-0/+4
* | | | Merge branch '41139-codequality-and-qa-internal-is-leaking-to-shared-runners'...Kamil Trzciński2017-12-191-19/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use dedicated runners for all the CI jobs41139-codequality-and-qa-internal-is-leaking-to-shared-runnersRémy Coutable2017-12-181-19/+23
* | | | Merge branch 'sh-fix-milestone-id-migration' into 'master'Oswaldo Ferreira2017-12-191-0/+1
|\ \ \ \
| * | | | Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key mi...Stan Hu2017-12-181-0/+1
|/ / / /
* | | | Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'41248-datetime_utility-calls-a-missing-lang-export-function-from-locale-index-js⛄️ Sean McGivern ⛄️2017-12-182-7/+22
|\ \ \ \
| * | | | rework the merge_request_version_params to use Object#tapcommit-diff-discussion-in-mr-context-fix-linksMicaël Bergeron2017-12-181-8/+4
| * | | | fix the commit diff discussion sending the wrong urlMicaël Bergeron2017-12-182-7/+26
* | | | | Merge branch 'use-queue_namespace' into 'master'Stan Hu2017-12-182-1/+2
|\ \ \ \ \
| * | | | | Add pipeline_creation:run_pipeline_schedule into Sidekiq queue listuse-queue_namespaceStan Hu2017-12-181-0/+1
| * | | | | Use queue_namespace rather than enqueue_inLin Jen-Shin2017-12-181-1/+1
| |/ / / /
* | | | | Merge branch 'ph-es-notes-module' into 'master'Filipa Lacerda2017-12-188-24/+25
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-modulePhil Hughes2017-12-18252-903/+1709
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Export and use Notes ES modulePhil Hughes2017-12-158-24/+25
* | | | | | Merge branch '41117-empty-state' into 'master'Phil Hughes2017-12-182-497/+522
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Only render signout screen when user is signed outFilipa Lacerda2017-12-182-497/+522
|/ / / / /
View Lorry Controller Status