summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix styling of snippet and commit discussion comments53918-snippet-commit-commentsAnnabel Dunstone Gray2018-11-142-4/+24
|
* Merge branch '53972-fix-fill-shards' into 'master'Stan Hu2018-11-131-6/+5
|\ | | | | | | | | | | | | Fix a race condition in the shard population logic Closes #53972 See merge request gitlab-org/gitlab-ce!23028
| * Fix a race condition intermittently breaking GitLab startupNick Thomas2018-11-131-6/+5
| |
* | Merge branch 'enable-image-comments-for-renamed-files' into 'master'Filipa Lacerda2018-11-131-2/+5
|\ \ | | | | | | | | | | | | Fixed image commenting on moved files See merge request gitlab-org/gitlab-ce!23023
| * | Fixed image commenting on moved filesPhil Hughes2018-11-131-2/+5
| | |
* | | Fix broken UI on commit discussionsAnnabel Dunstone Gray2018-11-135-22/+40
| |/ |/|
* | Merge branch '_acet-discussion-redesign-fixes' into 'master'Annabel Dunstone Gray2018-11-131-4/+1
|\ \ | | | | | | | | | | | | | | | | | | Border radius fixes for redesigned discussions Closes #53880 and #53767 See merge request gitlab-org/gitlab-ce!23006
| * | Border radius fixes for redesigned discussions_acet-discussion-redesign-fixesFatih Acet2018-11-131-4/+1
| | |
* | | Merge branch '51259-tooltip' into 'master'Phil Hughes2018-11-131-24/+21
|\ \ \ | | | | | | | | | | | | | | | | Updates ci header component with gitlab-ui See merge request gitlab-org/gitlab-ce!23000
| * | | Updates ci header component with gitlab-ui51259-tooltipFilipa Lacerda2018-11-131-24/+21
| | | | | | | | | | | | | | | | | | | | It reuses loading button instead of creating a new loading button It uses the new gitlab-ui components
* | | | Merge branch 'qa-auto-assign-codeowner-spec' into 'master'Grzegorz Bizon2018-11-131-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Update merge request page object and selectors See merge request gitlab-org/gitlab-ce!22939
| * | | Update merge request page object and selectorsqa-auto-assign-codeowner-specMark Lapierre2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | These are changes from EE that are also relevant to CE from: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8372
* | | | Merge branch 'refactor-reference-regexes-and-identity-scopes' into 'master'Robert Speicher2018-11-135-17/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor reference regexes and identity scopes See merge request gitlab-org/gitlab-ce!22987
| * | | | Move Identity.uniqueness_scope to a modulerefactor-reference-regexes-and-identity-scopesYorick Peterse2018-11-122-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving this method to a separate module looks a bit odd, but it allows for EE to extend the method without also having to redefine a variety of validation rules.
| * | | | Turn reference regex constants into methodsYorick Peterse2018-11-123-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Mentionable::ReferenceRegexes` used to define the following two constants: 1. DEFAULT_PATTERN 2. EXTERNAL_PATTERN These two constants were built using some of the class methods that reside in this same module. In EE we redefine one of these methods by using `prepend` at the start of the `ReferenceRegexes` module. This poses a problem: we can not move the `prepend` to the end of the file, because the constants later on depend on it. To resolve this problem, this commit turns these constants into class methods that memoize their results. This allows EE to redefine the appropriate methods before these two class methods are used, in turn allowing us to move the `prepend` to the end of the file. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8198 for more information.
* | | | | Merge branch 'archive-builds-documentation' into 'master'Achilleas Pipinellis2018-11-131-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for archive builds Closes #53534 See merge request gitlab-org/gitlab-ce!22909
| * | | | | Update docsarchive-builds-documentationKamil Trzciński2018-11-131-4/+5
| | | | | |
| * | | | | Add documentation for archive buildsKamil Trzciński2018-11-091-5/+4
| | | | | |
* | | | | | Show HTTP response code for Kubernetes errorsThong Kuah2018-11-135-15/+8
| | | | | |
* | | | | | Merge branch 'remove-mr-version-controls-form-fixed-width-container' into ↵Phil Hughes2018-11-131-6/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' remove .mr-version-controls from .fixed-with-container See merge request gitlab-org/gitlab-ce!23003
| * | | | | | remove .mr-version-controls from .fixed-with-containerOren Aksakal2018-11-121-6/+0
| | |_|_|/ / | |/| | | |
* | | | | | Fix deployment jobs using nil tokenThong Kuah2018-11-132-1/+3
| | | | | |
* | | | | | Fix help text in Admin Area > Background JobsMax Vogler2018-11-131-1/+4
| | | | | |
* | | | | | Merge branch '53888-missing-favicon' into 'master'Phil Hughes2018-11-131-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds back missing CI favicon Closes #53888 See merge request gitlab-org/gitlab-ce!23002
| * | | | | Adds back missing CI favicon53888-missing-faviconFilipa Lacerda2018-11-121-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CI favicon was missing in the jobs page. This commit fixes it. Closes #53888
* | | | | Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-121-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Align all avatars and system notes in discussion See merge request gitlab-org/gitlab-ce!22994
| * | | | Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
| | | | |
* | | | | Merge branch 'ce-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-125-131/+219
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues::MoveService (port of promote epics) See merge request gitlab-org/gitlab-ce!22766
| * | | | | Extract code from Issues::MoveServicece-3777-promote-to-epicJarka Košanová2018-11-125-131/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract code to make it easier reusable - introduce AttributesRewriter and ContentRewriter - support group entites when rewriting content - make Uploader copy_to working for Namespaces
* | | | | | Merge branch 'fix-tags-for-envs' into 'master'Stan Hu2018-11-121-5/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tags for environments Closes gitlab-ee#8397 See merge request gitlab-org/gitlab-ce!22993
| * | | | | | Fix non-hacking wayKamil Trzciński2018-11-121-2/+1
| | | | | | |
| * | | | | | Do not reload self on hooks when creating deploymentfix-tags-for-envsKamil Trzciński2018-11-121-3/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sh-53180-append-path' into 'master'Rémy Coutable2018-11-127-32/+28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure there's only one slash as path separator Closes #53180 See merge request gitlab-org/gitlab-ce!22954
| * | | | | Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-097-32/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4, `URI.join("http://test//", "a").to_s` will remove the double slash, however it's not the case in Ruby 2.5. Using chomp should work better for the intention, as we're not trying to allow things like ../ or / paths resolution. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
* | | | | | Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'Douwe Maan2018-11-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MergeRequestService erroring out on deleted branch Closes #53853 See merge request gitlab-org/gitlab-ce!22989
| * | | | | | Fix MergeRequestService erroring out on deleted branchStan Hu2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a branch is deleted, the push commit IDs is an empty array. The previous change would attempt to call `[].exists?`, which is invalid. Fix this by returning `MergeRequestDiffCommit.none` instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53853
* | | | | | | Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-123-10/+2
|/ / / / / /
* | | | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-128-25/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * | | | | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-098-25/+71
| | | | | | |
* | | | | | | Merge branch 'mr-tree-filter-path-name' into 'master'Filipa Lacerda2018-11-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed diff tree filtering to path Closes #53781 See merge request gitlab-org/gitlab-ce!22978
| * | | | | | | Changed diff tree filtering to pathPhil Hughes2018-11-121-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was using name which could make it hard to filter for the file you want in a certain folder. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781
* | | | | | | Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-127-23/+30
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607
| * | | | | | Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvementPhil Hughes2018-11-091-8/+11
| | | | | | |
| * | | | | | Init task list when creating new note & discussionPhil Hughes2018-11-092-0/+2
| | | | | | |
| * | | | | | Fix TaskList init on update & pollPhil Hughes2018-11-092-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed duplicate TaskList requests being made
| * | | | | | Improve initial rendering of discussion notesPhil Hughes2018-11-095-13/+21
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the initial rendering performance of notes by only creating a new TaskList for the whole app, rather than on a per-note component basis.
* | | | | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-123-0/+59
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
| * | | | | Fix minor offensesblackst0ne-add-discord-serviceblackst0ne2018-11-101-5/+1
| | | | | |
| * | | | | DRY specs, fix typos in docsblackst0ne2018-11-061-1/+1
| | | | | |
| * | | | | Update discord notification serviceblackst0ne2018-11-051-6/+4
| | | | | |