summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rename note signed out widgetvue-shared-notesSimon Knox2017-11-164-11/+11
* move note header component to vue_sharedSimon Knox2017-11-165-10/+10
* Merge branch '39861-follow-up-from-enable-multiple-queries-per-prometheus-gra...Mike Greiling2017-11-151-0/+17
|\
| * Add missing spec for computed prop strokeDashArray39861-follow-up-from-enable-multiple-queries-per-prometheus-graphJose Ivan Vargas2017-11-131-0/+17
* | Merge branch '40020-npm-list-errors-for-gitlab-svgs-and-node-pre-gyp' into 'm...Annabel Dunstone Gray2017-11-154-8/+8
|\ \
| * | Resolve "npm list errors for gitlab-svgs and node-pre-gyp"Tim Zallmann2017-11-154-8/+8
|/ /
* | Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'Filipa Lacerda2017-11-1519-1064/+1211
|\ \
| * | Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojioneEric Eastwood2017-11-154-4/+7
| * | Add basic emoji development docsEric Eastwood2017-11-153-0/+34
| * | Add rainbow_flag to emoji support mapEric Eastwood2017-11-154-13/+62
| * | Regenerate emoji digests with latest gemojioneEric Eastwood2017-11-1414-1050/+1111
* | | Merge branch 'tree_item_limit' into 'master'Douwe Maan2017-11-155-7/+59
|\ \ \
| * | | Truncate tree to max 1,000 items and display notice to usersDrew Blessing2017-11-155-7/+59
* | | | Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-ti...Douwe Maan2017-11-1510-23/+60
|\ \ \ \
| * | | | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-1510-23/+60
| |/ / /
* | | | Merge branch '39573-hashed-storage-backup' into 'master'Stan Hu2017-11-154-9/+26
|\ \ \ \
| * | | | Changelog39573-hashed-storage-backupGabriel Mazetto2017-11-151-0/+5
| * | | | Fix dumping hashed storage based repositoryGabriel Mazetto2017-11-153-9/+21
| |/ / /
* | | | Merge branch '40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3...Sean McGivern2017-11-151-3/+3
|\ \ \ \
| * | | | Always fetch master from the canonical remoteRémy Coutable2017-11-151-3/+3
| |/ / /
* | | | Merge branch 'fix-typo' into 'master'Sean McGivern2017-11-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update getting_started_part_one.mdChế Tiệp Chân Khoa2017-11-141-1/+1
* | | | Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-154-15/+19
|\ \ \ \
| * | | | Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-154-15/+19
* | | | | Merge branch 'workhorse-3-3-1' into 'master'Rémy Coutable2017-11-151-1/+1
|\ \ \ \ \
| * | | | | Update gitlab-workhorse to v3.3.1Nick Thomas2017-11-141-1/+1
* | | | | | Merge branch 'rs-qa-default-timeout' into 'master'Grzegorz Bizon2017-11-151-1/+1
|\ \ \ \ \ \
| * | | | | | Raise the QA Capybara's default wait time from 4 to 10rs-qa-default-timeoutRobert Speicher2017-11-141-1/+1
* | | | | | | Merge branch 'update-merge-worker-metrics' into 'master'Sean McGivern2017-11-153-1/+34
|\ \ \ \ \ \ \
| * | | | | | | [ci-skip] lintingupdate-merge-worker-metricsMicael Bergeron2017-11-141-1/+0
| * | | | | | | rework the logging to be simpler and add a thresholdmicael.bergeron2017-11-142-9/+21
| * | | | | | | [ci-skip] add changelogGitLab Development2017-11-131-0/+5
| * | | | | | | add simple logging to UpdateMergeRequestsWorker#performmicael.bergeron2017-11-132-1/+18
* | | | | | | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ...Phil Hughes2017-11-152-10/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widgetEric Eastwood2017-11-132-10/+11
* | | | | | | | | Merge branch '33338-internationalization-support-for-prometheus-service-confi...Phil Hughes2017-11-153-18/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve "Internationalization support for Prometheus Service Configuration"Jose Ivan Vargas Lopez2017-11-153-18/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-2' into 'master'Achilleas Pipinellis2017-11-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace 'charts' with 'chart'Nestor Pestelos2017-11-151-1/+1
* | | | | | | | | | Merge branch '38007-update-licensing-docs' into 'master'Achilleas Pipinellis2017-11-151-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update licensing docs to mention that we check node_modules for license infor...38007-update-licensing-docsMike Greiling2017-09-291-3/+3
* | | | | | | | | | | Merge branch '40161-extra-margin-on-svg-logo-in-header' into 'master'Annabel Dunstone Gray2017-11-152-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 40161 Remove extra margin from wordmark in header40161-extra-margin-on-svg-logo-in-headertauriedavis2017-11-142-1/+6
* | | | | | | | | | | | Merge branch 'gitaly-fix-broken-specs' into 'master'Robert Speicher2017-11-141-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | we need to disable gitaly for some testsKim "BKC" Carlbäcker2017-11-141-2/+6
* | | | | | | | | | | | Update CHANGELOG.md for 10.1.4Felipe Artur2017-11-145-21/+10
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqFelipe Artur2017-11-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch dev/master into masterFelipe Artur2017-11-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Prevent error when authorizing an admin-created OAauth application without a ...Douwe Maan2017-11-132-5/+14
| * | | | | | | | | | Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-137-39/+14