summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate Gitlab::Git::Wiki#delete_page to Gitalyfeature/migrate-wiki-delete-page-to-gitalyAhmad Sherif2017-10-317-23/+62
| | | | Closes gitaly#673
* Merge branch ↵Douwe Maan2017-10-313-6/+26
|\ | | | | | | | | | | | | | | | | '39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses' into 'master' Resolve "Emails on Push are sent to only the first recipient when using AWS SES" Closes #39593 See merge request gitlab-org/gitlab-ce!15083
| * Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-sesSean McGivern2017-10-303-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | The emails on push feature reuses the same email object, to avoid the expensive work of generating the email body. This interceptor would previously set multiple values for the same header, as that's the mail gem's default behaviour when called with the same header more than once. We don't want to change the emails on push service (although it's the only place where this happens), but fixing the interceptor is just as sensible anyway.
* | Merge branch ↵Phil Hughes2017-10-3110-257/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '39616-convert-autosize-js-library-to-be-a-yarn-managed-library' into 'master' Resolve "Convert autosize.js library to be a Yarn managed library" Closes #39616 See merge request gitlab-org/gitlab-ce!15087
| * | Resolve "Convert autosize.js library to be a Yarn managed library"Tim Zallmann2017-10-3110-257/+19
|/ /
* | Merge branch 'revert-2573818f' into 'master'Phil Hughes2017-10-3116-174/+93
|\ \ | | | | | | | | | | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'" See merge request gitlab-org/gitlab-ce!15092
| * | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-3016-174/+93
|/ / | | | | This reverts merge request !15009
* | Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-libraryAnnabel Dunstone Gray2017-10-305-21/+12
|\ \ | | | | | | | | | | | | | | | | | | Enable NestingDepth (level 6) on scss-lint Closes #39582 See merge request gitlab-org/gitlab-ce!15073
| * | Enable NestingDepth (level 6) on scss-lintTakuya Noguchi2017-10-305-21/+12
| | |
* | | Merge branch '39583-reopen-issue-count-cache' into 'master'Rémy Coutable2017-10-303-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refresh open Issue and Merge Request project counter caches when re-opening Closes #39583 See merge request gitlab-org/gitlab-ce!15085
| * | | Refresh open Issue and Merge Request project counter caches when re-openingRob Ede2017-10-303-0/+7
|/ / /
* | | Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'Rémy Coutable2017-10-306-10/+15
|\ \ \ | | | | | | | | | | | | | | | | Fix broken Members link when relative URL root paths are used See merge request gitlab-org/gitlab-ce!15070
| * | | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-rootStan Hu2017-10-276-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigating to the "Members" section of a project would omit the relative URL root path. Fix the redirection and eliminate the need for a redirection in the first place. Fix other redirections failing to work with relative roots
* | | | Merge branch ↵Sean McGivern2017-10-306-2/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39570-performance-bar-appears-enabled-even-though-it-won-t-show-up' into 'master' Resolve "Performance bar appears enabled even though it won't show up" Closes #39570 See merge request gitlab-org/gitlab-ce!15084
| * | | | Add .gitlab/route-map.ymlRémy Coutable2017-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Allow to disable the Performance Bar and document the `p b` shortcut in its ↵Rémy Coutable2017-10-305-2/+36
| | |_|/ | |/| | | | | | | | | | | | | | | | | | doc page Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '38869-importer_status' into 'master'Phil Hughes2017-10-3013-476/+305
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove code from global namespace See merge request gitlab-org/gitlab-ce!15058
| * | | | Fix queried element38869-importer_statusFilipa Lacerda2017-10-301-3/+3
| | | | |
| * | | | Merge branch 'master' into 38869-importer_statusFilipa Lacerda2017-10-30144-583/+2125
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) Move locked check to a guard-clause Ci::Build tag is a trait instead of an own factory [CE backport] Saved configuration for issue board Use the correct project visibility in system hooks Add changelog more readable changelog Make merge_jid handling less stateful in MergeService Fetch the merged branches at once remove extra whitespace use a delegate for `username` to be more future friendly Merging EE doc into CE add changelog entry Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername ...
| * | | | | Remove issuable form from global namespaceFilipa Lacerda2017-10-264-102/+98
| | | | | |
| * | | | | Remove issuableContext from global namespaceFilipa Lacerda2017-10-266-64/+60
| | | | | |
| * | | | | Improves issuable testsFilipa Lacerda2017-10-263-70/+37
| | | | | | | | | | | | | | | | | | | | | | | | Fixes missing dependencies
| * | | | | Remove old codeFilipa Lacerda2017-10-265-242/+112
| | | | | |
* | | | | | Merge branch 'update-fe-i18n-guide' into 'master'Filipa Lacerda2017-10-303-10/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update i18n in FE docs for marking and interpolation See merge request gitlab-org/gitlab-ce!15020
| * | | | | | Update i18n in FE docs, marking, interpolationupdate-fe-i18n-guideEric Eastwood2017-10-243-10/+39
| | | | | | |
* | | | | | | Merge branch ↵Fatih Acet2017-10-303-5/+16
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone' into 'master' Fix call stack size exceeded group milestone description autocomplete Closes #39020 See merge request gitlab-org/gitlab-ce!14972
| * | | | | | Split project and group milestone dispatcher branch39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestoneLuke "Jared" Bennett2017-10-241-0/+4
| | | | | | |
| * | | | | | Prefer dispatcher glform init over global initLuke "Jared" Bennett2017-10-231-0/+1
| | | | | | |
| * | | | | | Added group milestones form specLuke "Jared" Bennett2017-10-201-3/+10
| | | | | | |
| * | | | | | Remove page-specific GLForm init and add support_autocomplete: false local ↵Luke "Jared" Bennett2017-10-202-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to groups/milestones/_form
* | | | | | | Merge branch ↵Stan Hu2017-10-302-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_data-39504' into 'master' Update Prometheus Gem to fix problem caused by using wrong data offsets See merge request gitlab-org/gitlab-ce!15081
| * | | | | | | Update Prometheus Gem to fix problem caused by reading bad data.Pawel Chojnacki2017-10-302-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'fix/project-select-js-without-button' into 'master'Filipa Lacerda2017-10-302-10/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed project select to use it independently and not onlt as a combobutton See merge request gitlab-org/gitlab-ce!15043
| * | | | | | | | Changed project select to use it independently and not onlt as a combobuttonFrancisco Javier López2017-10-302-10/+19
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-500-on-old-merge-requests' into 'master'Douwe Maan2017-10-303-3/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error for old (somewhat) MRs Closes #36540 See merge request gitlab-org/gitlab-ce!14945
| * | | | | | | Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-303-3/+47
|/ / / / / / /
* | | | | | | Merge branch 'an/gitaly-v0.50.0' into 'master'Sean McGivern2017-10-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v0.50.0 See merge request gitlab-org/gitlab-ce!15050
| * | | | | | | Upgrade Gitaly to v0.50.0an/gitaly-v0.50.0Andrew Newdigate2017-10-261-1/+1
| | | | | | | |
* | | | | | | | Merge branch ↵Yorick Peterse2017-10-302-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #39054 See merge request gitlab-org/gitlab-ce!15063
| * | | | | | | | Avoid hitting statement timeout finding MR pipelines39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeoutSean McGivern2017-10-272-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For MRs with many thousands of commits, `SELECT DISTINCT(sha)` will be very slow. What we can't do to fix this: 1. Add an index. Postgres won't use it for DISTINCT without a lot of ceremony. 2. Do the `uniq` in Ruby. That can still be very slow with hundreds of thousands of commits. 3. Use a subquery. We haven't removed the `st_commits` column yet, but we will soon. Until 3 is available to us, we can just do 2, but also add a limit clause. There is no ordering, so this may return different results, but our goal with these MRs is just to get them to load, so it's not a huge deal.
* | | | | | | | | Merge branch '39426-update-fog-google-docs' into 'master'Achilleas Pipinellis2017-10-301-33/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for backing up to Google Cloud Storage See merge request gitlab-org/gitlab-ce!15074
| * | | | | | | | | Split S3 and Google Cloud Storage sections in backup docAchilleas Pipinellis2017-10-301-52/+90
| | | | | | | | | |
| * | | | | | | | | Add docs for backing up to Google Cloud Storage39426-update-fog-google-docsLin Jen-Shin2017-10-301-0/+19
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-add-circuitbreaker-metrics-docs' into 'master'Achilleas Pipinellis2017-10-301-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add missing circuitbreaker metrics to prometheus documentation See merge request gitlab-org/gitlab-ce!15062
| * | | | | | | | Add missing circuitbreaker metrics to prometheus documentationbvl-add-circuitbreaker-metrics-docsBob Van Landuyt2017-10-271-1/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-tag-trait-ci-build' into 'master'Grzegorz Bizon2017-10-302-9/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Build tag is a trait instead of an own factory See merge request gitlab-org/gitlab-ce!15077
| * | | | | | | | | Ci::Build tag is a trait instead of an own factoryZeger-Jan van de Weg2017-10-302-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor annoyance of mine, and there were a couple of things wrong, for example: 1. Switching on a property is just a trait 2. It didn't inherrit from its parent Find and replace through the code based fixed all occurances.
* | | | | | | | | | Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-307-60/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
| * | | | | | | | | Move locked check to a guard-clauseOswaldo Ferreira2017-10-301-1/+3
| | | | | | | | | |
| * | | | | | | | | Add changelogmake-merge-jid-handling-less-statefulOswaldo Ferreira2017-10-291-0/+5
| | | | | | | | | |
View Lorry Controller Status