summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objectsBob Van Landuyt2017-12-193-1/+27
| | | | | | If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
* Merge branch 'except-qa-and-docs' into 'master'Grzegorz Bizon2017-12-191-26/+18
|\ | | | | | | | | Make sure two except won't overwrite each other See merge request gitlab-org/gitlab-ce!16010
| * Make sure two except won't overwrite each otherLin Jen-Shin2017-12-191-26/+18
|/ | | | | | This is a pretty boring solution, but I can't think of a good idea right now and this might be good enough for now...
* Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-198-0/+24
|\ | | | | | | | | Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973
| * 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 ↵Kamil Trzciński2017-12-191-19/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '41139-codequality-and-qa-internal-is-leaking-to-shared-runners' into 'master' Resolve "Codequality and qa:internal is leaking to Shared Runners" Closes #41139 See merge request gitlab-org/gitlab-ce!15957
| * | Use dedicated runners for all the CI jobs41139-codequality-and-qa-internal-is-leaking-to-shared-runnersRémy Coutable2017-12-181-19/+23
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | 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 migration Closes gitlab-com/infrastructure#3416 See merge request gitlab-org/gitlab-ce!15997
| * | | Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key ↵Stan Hu2017-12-181-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | migration If milestone_id is NULL, we shouldn't need to update it to be NULL again. This was causing us to touch almost all rows in the issues table for no good reason. Closes https://gitlab.com/gitlab-com/infrastructure/issues/3416
* | | 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
|\ \ \ | | | | | | | | | | | | | | | | fix the commit diff discussion sending the wrong url See merge request gitlab-org/gitlab-ce!15988
| * | | 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
| | | | | | | | | | | | | | | | it should now send you to the merge request diff path scoped to the commit.
* | | | Merge branch 'use-queue_namespace' into 'master'Stan Hu2017-12-182-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use queue_namespace rather than enqueue_in See merge request gitlab-org/gitlab-ce!15989
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Export and use Notes ES module See merge request gitlab-org/gitlab-ce!15953
| * \ \ \ Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-modulePhil Hughes2017-12-18252-903/+1709
| |\ \ \ \ | | | |/ / | | |/| | | | | | | # Conflicts: # app/assets/javascripts/main.js
| * | | | 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 out Closes #41117 and #39843 See merge request gitlab-org/gitlab-ce!15935
| * | | | Only render signout screen when user is signed outFilipa Lacerda2017-12-182-497/+522
|/ / / /
* | | | Merge branch ↵Douwe Maan2017-12-1810-18/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master' Resolve "Todo notification count shows notification without having a todo" Closes #40871 See merge request gitlab-org/gitlab-ce!15807
| * | | | Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-1810-18/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the target is deleted, todos are destroyed, but we did not reset the todo cache for users with todos on the deleted target. This would only update after the next time the todo cache was updated for that user.
* | | | | Merge branch '39298-list-of-avatars-2' into 'master'Rémy Coutable2017-12-182-11/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List of avatars should never show +1 Closes #39298 See merge request gitlab-org/gitlab-ce!15972
| * | | | | List of avatars should never show +1Jacopo2017-12-182-11/+12
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | The list of avatars should never show +1. If you have +1, that means you can use that space to show that person's avatar, for that reason should always start with +2.
* | | | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-1815-12/+371
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700
| * | | | | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-nowStan Hu2017-12-124-21/+53
| | | | | |
| * | | | | Fix Rubocop offense and use a symbol instead of a stringStan Hu2017-12-122-2/+2
| | | | | |
| * | | | | Add spec for ActionRateLimiterStan Hu2017-12-122-2/+29
| | | | | |
| * | | | | Add a spec for rate limiting pipeline schedulesStan Hu2017-12-122-2/+12
| | | | | |
| * | | | | Add rate limiting to guard against excessive scheduling of pipelinesStan Hu2017-12-123-1/+43
| | | | | |
| * | | | | Avoid Gitaly N+1 calls by caching tag_namesStan Hu2017-12-123-0/+17
| | | | | |
| * | | | | Fix Sidekiq worker and make flash message return a link to the pipelines pageStan Hu2017-12-123-3/+3
| | | | | |
| * | | | | Refactor common protected ref checkStan Hu2017-12-123-16/+102
| | | | | |
| * | | | | Fix conditions for checking pipeline schedule rulesStan Hu2017-12-122-4/+4
| | | | | |
| * | | | | Create a play_pipeline_schedule policy and use itStan Hu2017-12-124-7/+40
| | | | | |
| * | | | | Address some comments with running a pipeline scheduleStan Hu2017-12-126-16/+21
| | | | | |
| * | | | | Add button to run scheduled pipeline immediatelyStan Hu2017-12-128-3/+110
| | | | | | | | | | | | | | | | | | | | | | | | Closes #38741
* | | | | | Merge branch '39836-document-how-lfs-integrity-check-push-prevention-works' ↵Achilleas Pipinellis2017-12-181-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Document how LFS integrity check push prevention works" Closes #39836 See merge request gitlab-org/gitlab-ce!15958
| * | | | | | Document LFS integrity check and how to disable itJames Edwards-Jones2017-12-181-0/+8
| | | | | | |
* | | | | | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-1815-99/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
| * | | | | | | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-1515-99/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests
* | | | | | | | Merge branch 'winh-translate-contributors-page-dates' into 'master'Filipa Lacerda2017-12-1810-14/+210
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate contributors page dates Closes #39283 and #38592 See merge request gitlab-org/gitlab-ce!15846
| * | | | | | | | Translate date ranges on contributors pageWinnie Hellmann2017-12-182-8/+39
| | | | | | | | |
| * | | | | | | | Move dateTickFormat to separate moduleWinnie Hellmann2017-12-185-26/+94
| | | | | | | | |
| * | | | | | | | Add right padding to contributors graphWinnie Hellmann2017-12-181-1/+4
| | | | | | | | |
View Lorry Controller Status