summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Export JS classes as modulesph-more-es-modulesPhil Hughes2017-12-1513-503/+466
| | | | #38869
* Merge branch 'trigger-user-pipeline-info' into 'master'Grzegorz Bizon2017-12-151-4/+11
|\ | | | | | | | | Pass info regarding the user and job that initiated a trigger See merge request gitlab-org/gitlab-ce!15934
| * Make rubocop happyBalasankar "Balu" C2017-12-151-1/+1
| |
| * Use guard clauseBalasankar "Balu" C2017-12-151-3/+1
| |
| * Improve languageBalasankar "Balu" C2017-12-151-4/+6
| |
| * PrettifyBalasankar "Balu" C2017-12-151-4/+9
| |
| * Use temp branchBalasankar "Balu" C2017-12-151-1/+1
| |
| * Pass info about who started the job and which job triggered itBalasankar "Balu" C2017-12-151-1/+3
|/
* Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-149-10/+30
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly Closes gitaly#808 See merge request gitlab-org/gitlab-ce!15770
| * Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-139-10/+30
| | | | | | | | Closes gitaly#808
* | Merge branch 'docs-add-indexes-monitoring' into 'master'Achilleas Pipinellis2017-12-146-82/+96
|\ \ | | | | | | | | | | | | Docs: add indexes for monitoring and performance monitoring See merge request gitlab-org/gitlab-ce!15942
| * | Docs: add indexes for monitoring and performance monitoringMarcia Ramos2017-12-146-82/+96
|/ /
* | Merge branch 'clearer-documentation-on-inline-diffs' into 'master'Achilleas Pipinellis2017-12-142-3/+25
|\ \ | | | | | | | | | | | | clearer-documentation-on-inline-diffs See merge request gitlab-org/gitlab-ce!15938
| * | clearer-documentation-on-inline-diffsDimitrie Hoekstra2017-12-142-3/+25
|/ /
* | Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master'Achilleas Pipinellis2017-12-144-0/+47
|\ \ | | | | | | | | | | | | Add commit diff discussion in merge request context documentation See merge request gitlab-org/gitlab-ce!15885
| * | Add docs for commit diff discussion in merge requestsmicael.bergeron2017-12-144-0/+47
| | |
* | | Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-144-20/+32
|\ \ \ | | | | | | | | | | | | | | | | Update flipper to 0.11.0 and take advantage of the new features See merge request gitlab-org/gitlab-ce!15920
| * | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-144-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added an ActiveSupport (using Rails.cache) caching adapter - Overview of the new features can be found at https://johnnunemaker.com/flippin-features-at-runtime/ - Full Changelog can be found at https://github.com/jnunemaker/flipper/blob/v0.11.0/Changelog.md Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-1410-121/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Converted JS files into exported modules See merge request gitlab-org/gitlab-ce!15933
| * | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-1410-121/+67
| | | | |
* | | | | Merge branch 'docs-jprovazn-create-from-email' into 'master'Marcia Ramos2017-12-143-5/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed doc for create MR from email See merge request gitlab-org/gitlab-ce!15849
| * | | | | Fixed doc for create MR from emaildocs-jprovazn-create-from-emailJan Provaznik2017-12-123-5/+12
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | * fixed anchor for create MR from email * added a screenshot for this feature
* | | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-142-3/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong project Closes gitlab-ee#4325 See merge request gitlab-org/gitlab-ce!15936
| * | | | | Clear BatchLoader after each spec to prevent holding onto records longer ↵dm-batchloader-projectDouwe Maan2017-12-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | than necessary
| * | | | | Include project in BatchLoader key to prevent returning blobs for the wrong ↵Douwe Maan2017-12-141-3/+9
| | |/ / / | |/| | | | | | | | | | | | | project
* | | | | Merge branch '40509_sorting_tags_api' into 'master'Rémy Coutable2017-12-146-5/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sorting for tags api See merge request gitlab-org/gitlab-ce!15772
| * | | | | sorting for tags apihaseeb2017-12-146-5/+65
|/ / / / /
* | | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-143-14/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clear caches before updating MR diffs See merge request gitlab-org/gitlab-ce!15916
| * | | | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-143-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hook ordering influenced the diffs being generated as these used values from before the update due to the memoization still being in place. This commit reorders them and tests against this behaviour.
* | | | | | Merge branch ↵Kamil Trzciński2017-12-143-10/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41110-dependencies-validator-fails-when-depended-job-is-manual' into 'master' Dependencies Validator fails when depended job is `manual` Closes #41110 See merge request gitlab-org/gitlab-ce!15924
| * | | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-143-10/+7
| | | | | | |
* | | | | | | Merge branch 'qa/gb/update-qa-dependencies' into 'master'Grzegorz Bizon2017-12-143-52/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab QA dependencies See merge request gitlab-org/gitlab-ce!15929
| * | | | | | | Use new Ruby version 2.4 in GitLab QA imagesGrzegorz Bizon2017-12-141-1/+1
| | | | | | | |
| * | | | | | | Update GitLab QA dependenciesGrzegorz Bizon2017-12-142-51/+45
| | | | | | | |
* | | | | | | | Merge branch 'gitlab-shell-5-10-3' into 'master'Grzegorz Bizon2017-12-141-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-shell version to 5.10.3 See merge request gitlab-org/gitlab-ce!15932
| * | | | | | | Bump gitlab-shell version to 5.10.3Sean McGivern2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-shell 5.10.3 does not introduce any new features; it just removes an unused config option.
* | | | | | | | Merge branch 'tc-correct-email-in-reply-to' into 'master'Sean McGivern2017-12-146-7/+96
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mail notifications of discussion notes In-Reply-To of each other Closes #36054 See merge request gitlab-org/gitlab-ce!14289
| * | | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-134-19/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a note is part of a discussion, the email sent out will be `In-Reply-To` the previous note in that discussion. It also `References` all the previous notes in that discussion, and the original issue. Closes gitlab-org/gitlab-ce#36054.
| * | | | | | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-135-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a note is part of a discussion, the email sent out should be `In-Reply-To` the previous note in that discussion. Closes gitlab-org/gitlab-ce#36054
* | | | | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master'Sean McGivern2017-12-143-3/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use author info on commits list page rather than most recent commit date Closes #25317 See merge request gitlab-org/gitlab-ce!15868
| * | | | | | | | | Fix commits_spec25317-prioritize-author-date-over-commitAnnabel Dunstone Gray2017-12-131-1/+1
| | | | | | | | | |
| * | | | | | | | | Change committed text to authoredAnnabel Dunstone Gray2017-12-131-1/+1
| | | | | | | | | |
| * | | | | | | | | Use author info on commits list page rather than most recent commit dateAnnabel Dunstone Gray2017-12-112-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-1445-102/+510
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a dedicated queue for each Sidekiq worker See merge request gitlab-org/gitlab-ce!15882
| * | | | | | | | | Remove unused queuesdm-dedicated-sidekiq-queuesDouwe Maan2017-12-133-4/+17
| | | | | | | | | |
| * | | | | | | | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ↵Douwe Maan2017-12-137-6/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manually set their queue
| * | | | | | | | | Update docsDouwe Maan2017-12-121-15/+44
| | | | | | | | | |
| * | | | | | | | | Use a dedicated queue for each workerDouwe Maan2017-12-1237-81/+336
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'update-doc-for-user-group-project-transfers' into 'master'Douwe Maan2017-12-143-10/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Clarifies documentation for user, group & project transfers See merge request gitlab-org/gitlab-ce!15896
| * | | | | | | | Updates doc for user, group & project transfersupdate-doc-for-user-group-project-transfersMayra Cabrera2017-12-133-10/+15
| | | | | | | | |
View Lorry Controller Status