summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '30975-fixed-top-nav-POC' into 'master' Annabel Dunstone Gray2017-05-1224-35/+70
|\ | | | | | | | | | | | | Add fixed positioning to top level navbar Closes #30975 See merge request !10751
| * 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 RCs See merge request !11345
| * | Relax rake backup regex to handle CE and EE RCssh-relax-backup-rake-specStan Hu2017-05-121-1/+1
| | | | | | | | | | | | See http://rubular.com/r/uTDlT85zW1
* | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-1215-200/+268
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
| * | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-1215-200/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | | | Merge branch 'new-branch-new-mr-docs' into 'master' Filipa Lacerda2017-05-122-0/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | New branch new mr docs See merge request !11308
| * | | New branch new mr docsVictor Wu2017-05-122-0/+6
|/ / /
* | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-129-67/+118
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`.
* | | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-124-4/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project list cache key Closes #31863 See merge request !11325
| * | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-126-22/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-125-1/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-1224-148/+514
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Autolink package names in Gemfile See merge request !11224
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paste a copied MR source branch name as code when pasted into a GFM form See merge request !11315
| * \ \ \ \ \ Merge branch 'master' into 'dm-copy-mr-source-branch-as-gfm'dm-copy-mr-source-branch-as-gfmDouwe Maan2017-05-12202-1886/+2238
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
| * | | | | | | 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 some … See merge request !11288
| * | | | | | | | Removed all instances of Object.assign by using es6 classes, also includes ↵Luke "Jared" Bennett2017-05-127-263/+208
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | some …
* | | | | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-1216-83/+213
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | | | | | | | Respond with 404 when metrics are not enabled or deployment_metrics is not ↵Pawel Chojnacki2017-05-122-22/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implemented
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + fix tests
| * | | | | | | | Custom queries for prometheusPawel Chojnacki2017-05-1113-53/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* | | | | | | | | Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-122-1/+32
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Only rename namespaces and projects with an invalid path See merge request !11338
| * | | | | | | | Update rename_base.rbJames Lopez2017-05-121-1/+1
| | | | | | | | |
| * | | | | | | | Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-122-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For exact matches, not namespaces that end with an invalid path
* | | | | | | | | Merge branch 'dm-consistent-commit-sha-style' into 'master' Sean McGivern2017-05-1278-365/+314
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistently use monospace font for commit SHAs and branch and tag names See merge request !11276
| * | | | | | | | | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-1278-365/+314
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-form_spec-failure-wait_for_ajax-unneeded-command' into ↵Douwe Maan2017-05-121-8/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix form_spec.rb See merge request !11330
| * | | | | | | | | Fix wait_for_ajax in describe blockfix-form_spec-failure-wait_for_ajax-unneeded-commandLuke "Jared" Bennett2017-05-121-2/+2
| | | | | | | | | |
View Lorry Controller Status