summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-iconLuke "Jared" Bennett2017-05-132-1/+5
* Merge branch 'sh-remove-trailing-comma' into 'master' Douwe Maan2017-05-121-1/+1
|\
| * Remove trailing comma in dependency linker to satisfy RubocopStan Hu2017-05-121-1/+1
* | Merge branch '30975-fixed-top-nav-POC' into 'master' Annabel Dunstone Gray2017-05-1224-35/+70
|\ \
| * | Fix specsAnnabel Dunstone Gray2017-05-123-4/+4
| * | Clean up fixed navbarAnnabel Dunstone Gray2017-05-123-6/+9
| * | Fix specsAnnabel Dunstone Gray2017-05-1213-25/+30
| * | Fade out border on scrollAnnabel Dunstone Gray2017-05-124-11/+14
| * | Add animation to navbar borderAnnabel Dunstone Gray2017-05-121-2/+3
| * | Add nav border on scrollAnnabel Dunstone Gray2017-05-122-0/+15
| * | Remove trailing semicolonAnnabel Dunstone Gray2017-05-121-1/+1
| * | Add fixed positioning to top level navbarAnnabel Dunstone Gray2017-05-129-8/+16
* | | Merge branch 'sh-relax-backup-rake-spec' into 'master' Stan Hu2017-05-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Relax rake backup regex to handle CE and EE RCssh-relax-backup-rake-specStan Hu2017-05-121-1/+1
* | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-1215-200/+268
|\ \ \
| * | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-1215-200/+268
* | | | Merge branch 'new-branch-new-mr-docs' into 'master' Filipa Lacerda2017-05-122-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | New branch new mr docsVictor Wu2017-05-122-0/+6
|/ / /
* | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-129-67/+118
|\ \ \
| * | | update the documentation to reflect upcoming changes to the usage pingdisable-usage-pingJob van der Voort2017-05-111-64/+9
| * | | Add hostname to usage pingSean McGivern2017-05-113-0/+6
| * | | Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-116-8/+108
* | | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-124-4/+16
|\ \ \ \
| * | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-126-22/+5
| * | | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-125-1/+30
* | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-1224-148/+514
|\ \ \ \ \
| * | | | | Add changelogdm-dependency-linker-gemfileDouwe Maan2017-05-121-0/+4
| * | | | | Remove unrelated link from specDouwe Maan2017-05-121-7/+0
| * | | | | Link Gemfile git URLsDouwe Maan2017-05-122-1/+8
| * | | | | Fix specsDouwe Maan2017-05-102-4/+4
| * | | | | Turn blob dependency links blueDouwe Maan2017-05-105-0/+25
| * | | | | Autolink package names in GemfileDouwe Maan2017-05-107-10/+263
| * | | | | Add Gitlab::StringRegexMarkerDouwe Maan2017-05-103-2/+33
| * | | | | Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-107-134/+187
* | | | | | Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-122-1/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'dm-copy-mr-source-branch-as-gfm'dm-copy-mr-source-branch-as-gfmDouwe Maan2017-05-12202-1886/+2238
| |\ \ \ \ \ \
| * | | | | | | Satisfy ESlintDouwe Maan2017-05-121-3/+4
| * | | | | | | Paste a copied MR source branch name as code when pasted into a GFM formDouwe Maan2017-05-112-1/+13
* | | | | | | | Merge branch 'remove-droplab-object-assign-calls' into 'master' Clement Ho2017-05-127-263/+208
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed all instances of Object.assign by using es6 classes, also includes so...Luke "Jared" Bennett2017-05-127-263/+208
|/ / / / / / / /
* | | | | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-1216-83/+213
|\ \ \ \ \ \ \ \
| * | | | | | | | Respond with 404 when metrics are not enabled or deployment_metrics is not im...Pawel Chojnacki2017-05-122-22/+53
| * | | | | | | | Avoid comma t the end of hashPawel Chojnacki2017-05-123-3/+3
| * | | | | | | | match query times with appropriate deltaPawel Chojnacki2017-05-111-8/+9
| * | | | | | | | Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-116-17/+22
| * | | | | | | | Custom queries for prometheusPawel Chojnacki2017-05-1113-53/+146
* | | | | | | | | Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-122-1/+32
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Update rename_base.rbJames Lopez2017-05-121-1/+1
| * | | | | | | | Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-122-1/+32
* | | | | | | | | Merge branch 'dm-consistent-commit-sha-style' into 'master' Sean McGivern2017-05-1278-365/+314
|\ \ \ \ \ \ \ \ \