summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Improve variables supportimprove-variables-supportKamil Trzciński2018-11-193-28/+35
| | | | | | This ensures that variables accept only string, alongside also improves kubernetes_namespace, improving validation and default value being set.
* Ignore environment validation failureShinya Maeda2018-11-151-0/+4
|
* Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'Douwe Maan2018-11-151-6/+1
|\ | | | | | | | | | | | | Remove 'comment_on_any_diff_line' feature flag Closes #54034 See merge request gitlab-org/gitlab-ce!23093
| * Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ffOswaldo Ferreira2018-11-141-6/+1
| |
* | Merge branch 'notes-consistent-key-object-case' into 'master'Filipa Lacerda2018-11-1524-269/+252
|\ \ | | | | | | | | | | | | Made diff & note data consistent See merge request gitlab-org/gitlab-ce!22950
| * | Made diff & note data consistentPhil Hughes2018-11-1424-269/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused many pain points when working with it. Part of the data was camel cased the other snake case. Other parts where snake case & then getting converted in components, this conversion has the potential for leaking memory. This changes that & makes it consistent with what it returned from the API, snake case.
* | | Merge branch '53882-extra-container-diff-version' into 'master'Fatih Acet2018-11-141-2/+25
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix version system note Closes #53882 See merge request gitlab-org/gitlab-ce!23030
| * | Tweak vertical line to line up with system notes and comment avatars53882-extra-container-diff-versionAnnabel Dunstone Gray2018-11-141-1/+1
| | |
| * | Add back margin on discussion system notesAnnabel Dunstone Gray2018-11-141-1/+1
| | |
| * | Remove box on diff tab system noteAnnabel Dunstone Gray2018-11-141-0/+17
| | |
| * | Fix version system noteAnnabel Dunstone Gray2018-11-141-1/+7
| | |
* | | Merge branch 'dm-commit-email-select-options' into 'master'Stan Hu2018-11-141-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix bug causing not all emails to show up in commit email selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
| * | Fix bug causing not all emails to show up in commit email selectboxDouwe Maan2018-11-141-1/+1
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54045
* | | Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-142-4/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix styling of snippet and commit discussion comments Closes #53918 See merge request gitlab-org/gitlab-ce!23035
| * | | Fix styling of snippet and commit discussion comments53918-snippet-commit-commentsAnnabel Dunstone Gray2018-11-142-4/+24
| | | |
* | | | Merge branch 'discussion-fixes-2' into 'master'Fatih Acet2018-11-142-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix vertical line alignment in discussion & diff border-radius Closes #53975 See merge request gitlab-org/gitlab-ce!23075
| * | | Fix diff border radiusdiscussion-fixes-2Annabel Dunstone Gray2018-11-141-1/+1
| | | |
| * | | Fix vertical line alignment in discussionAnnabel Dunstone Gray2018-11-141-1/+1
| | | |
* | | | Add white background to commit diff commentsAnnabel Dunstone Gray2018-11-141-0/+4
|/ / /
* | | Merge branch 'fl-gitlab-ui-cicd' into 'master'Clement Ho2018-11-146-53/+25
|\ \ \ | |_|/ |/| | | | | | | | Updates pipeline code to use gitlab-ui See merge request gitlab-org/gitlab-ce!22999
| * | Removes jquery as a dependencyFilipa Lacerda2018-11-141-4/+3
| | |
| * | Updates pipeline code to use gitlab-uiFilipa Lacerda2018-11-126-50/+23
| | | | | | | | | | | | | | | Uses gltooltipDirective Removes whitespace
* | | Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-141-3/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix collapsed files not fully fully expanding Closes #53866 See merge request gitlab-org/gitlab-ce!23019
| * | | Fix collapsed files not fully fully expandingPhil Hughes2018-11-131-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes files that are collapsed by default not expanding when the expand all button is clicked. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53866
* | | | Disable updating appearance of filter tokens for special valuesHeinrich Lee Yu2018-11-141-4/+5
| | | |
* | | | Merge branch 'gt-show-navigation-line-separator-ce' into 'master'Nick Thomas2018-11-142-5/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Show navigation line separator when instance metrics is disabled See merge request gitlab-org/gitlab-ce!22940
| * | | | Show navigation line separator when instance metrics is disabledGeorge Tsiolis2018-11-132-5/+13
| | | | |
* | | | | Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-141-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to Rails 5 Closes #14286 and #48991 See merge request gitlab-org/gitlab-ce!21492
| * | | | | Add ApplicationRecord model classJan Provaznik2018-11-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | In Rails 5 all models by default inherit from ApplicationRecord.
* | | | | | Resolve "Activity Feed - Missing padding in event note when a branch is deleted"Martin Wortschack2018-11-141-2/+2
|/ / / / /
* | | | | Merge branch '53816-empty-label-menu-if-not-logged-in' into 'master'Rémy Coutable2018-11-141-22/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Empty label menu if not logged in" Closes #53816 See merge request gitlab-org/gitlab-ce!23042
| * | | | | Removes promote to group label for anonymous userJacopo2018-11-141-22/+23
| | |_|_|/ | |/| | |
* | | | | Avoid returning deployment metrics url to MR widget when the deployment is ↵Shinya Maeda2018-11-142-4/+8
| | | | | | | | | | | | | | | | | | | | not successful
* | | | | Track Kubernetes errors using SentryDylan Griffith2018-11-142-0/+3
| | | | |
* | | | | Merge branch '52940-fix-internal-email-pattern-not-respected' into 'master'Douwe Maan2018-11-141-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where internal email pattern wasn't respected Closes #52940 See merge request gitlab-org/gitlab-ce!22516
| * | | | Fix a bug where internal email pattern wasn't respected52940-fix-internal-email-pattern-not-respectedRémy Coutable2018-11-131-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | 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.