summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Rename issue template from "Add style" to "Coding style"Lin Jen-Shin2019-01-301-0/+0
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because there were a few people thought that's for UI styling...
* | | | | | | | | | Merge branch 'docs/restore-variable-naming' into 'master'Achilleas Pipinellis2019-01-3018-56/+61
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation now matches UI copy Closes #56783 See merge request gitlab-org/gitlab-ce!24659
| * | | | | | | | | | Documentation now matches UI copyEvan Read2019-01-3018-56/+61
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'anan-add-MethodCallWithoutArgsParentheses-cop' into 'master'Lin Jen-Shin2019-01-3026-47/+42
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable MethodCallWithoutArgsParentheses Cop Closes #56795 See merge request gitlab-org/gitlab-ce!24631
| * | | | | | | | | | Re-enable MethodCallWithoutArgsParentheses CopAndrew Newdigate2019-01-2926-47/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enables and autocorrects all instances of the Style/MethodCallWithoutArgsParentheses rule
* | | | | | | | | | | Merge branch 'docs/surface-auth-section-link' into 'master'Achilleas Pipinellis2019-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Surface link to auth section index See merge request gitlab-org/gitlab-ce!24787
| * | | | | | | | | | | Surface link to auth section indexEvan Read2019-01-301-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2019-01-301-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25569-changing-wording-to-delete-when-referring-to-removing-a-branch--docs' into 'master' Change `remove branch` to `delete branch` Closes #25569 See merge request gitlab-org/gitlab-ce!24574
| * | | | | | | | | | | Change `remove branch` to `delete branch`Sam Bigelow2019-01-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is to match `git branch -D` from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23966 This just documents the change
* | | | | | | | | | | | Merge branch 'sh-disable-nil-user-id-identity-validation' into 'master'Douwe Maan2019-01-303-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failed LDAP logins when nil user_id present Closes #56734 See merge request gitlab-org/gitlab-ce!24749
| * | | | | | | | | | | | Fix failed LDAP logins when nil user_id presentStan Hu2019-01-293-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a LDAP user signs in the for the first time and if there is an `Identity` object with `user_id` of `nil`, new users will not be able to be register until that entry is cleared because of the way identities are created: 1. First, the User object is built but not saved, so it has no `id`. 2. Then, `user.identities.build(provider: 'ldapmain')` is called, but it does not have an associated `user_id` as a result. 3. `User#save` is called, but the `Identity` validation fails if an existing entry with `user_id` of `nil` already exists. The uniqueness validation for `nil` values doesn't make any sense in this case. We should be enforcing this at the database level with a foreign key constraint. To work around the issue we can validate against the user instead, which does the right thing even when the user isn't saved yet. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56734
* | | | | | | | | | | | | Merge branch '56379-pipeline-stages-job-action-button-icon-is-not-aligned' ↵Filipa Lacerda2019-01-302-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Pipeline stages job action button icon is not aligned" Closes #56379 See merge request gitlab-org/gitlab-ce!24577
| * | | | | | | | | | | | | Move CI action icons down 1pxmfluharty2019-01-292-2/+7
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '53104-redesign-group-overview-ui-mvc' into 'master'Kushal Pandya2019-01-3016-293/+240
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redesign group overview UI: MVC" Closes #53104 See merge request gitlab-org/gitlab-ce!23866
| * | | | | | | | | | | | | Re-add class to prevent pointer events on new svg iconDennis Tang2019-01-291-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Refresh group overview to match project overviewDennis Tang2019-01-2516-293/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avatar, group name, and group description now left-aligned - Notification setting and "New project" CTA right-aligned with group avatar and name - Leave group / request access now a link next to the 'Group' label below the group name - Notification setting label removed in favor of icons - Tooltip added to indicate notification setting - Search option moved inside table header next to "Sort by"
* | | | | | | | | | | | | | Merge branch 'winh-noteable_discussion_spec-vue-test-utils' into 'master'Kushal Pandya2019-01-301-65/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert noteable_discussion_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24765
| * | | | | | | | | | | | | | Convert noteable_discussion_spec.js to Vue test utilsWinnie Hellmann2019-01-291-65/+77
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'qa-nightly-68-quarantine-devops-tests' into 'master'Ramya Authappan2019-01-301-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine auto devops QA tests See merge request gitlab-org/gitlab-ce!24786
| * | | | | | | | | | | | | | Quarantine devops testsSanad Liaquat2019-01-301-1/+2
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Evan Read2019-01-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing parameter cluster_id in the params list for edit project cluster endpoint See merge request gitlab-org/gitlab-ce!24731
| * | | | | | | | | | | | | Added missing parameter cluster_id in the params list for edit project ↵akkee2019-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cluster endpoint
* | | | | | | | | | | | | | Merge branch 'docs-repositories-api-fix' into 'master'Evan Read2019-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Minor fix to formatting See merge request gitlab-org/gitlab-ce!24696
| * | | | | | | | | | | | | | Docs: Minor fix to formattingMarti Raudsepp2019-01-261-1/+1
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'staging-26-delete_all_subgroups_task' into 'master'Dan Davison2019-01-294-1/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add script to remove all subgroups within a provided group See merge request gitlab-org/gitlab-ce!24593
| * | | | | | | | | | | | | | Add script to delete all subgroups within the specified groupSanad Liaquat2019-01-244-1/+91
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'revert-add-whats-new' into 'master'Dmitriy Zaporozhets2019-01-2911-293/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the "What's new" feature See merge request gitlab-org/gitlab-ce!24772
| * | | | | | | | | | | | | | | Revert the "What's new" featureBrandon Labuschagne2019-01-2911-293/+8
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '55820-adds-common-name-chart-value' into 'master'Stan Hu2019-01-292-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overrides commonName Helm chart value Closes #55820 See merge request gitlab-org/gitlab-ce!24683
| * | | | | | | | | | | | | | Common name needs to be lower caseJoão Cunha2019-01-282-2/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Overrides commonName Helm chart attr with default valueJoão Cunha2019-01-251-2/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ee-6526-port-ee-changes' into 'master'Douglas Barbosa Alexandre2019-01-291-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port EE style for lib/gitlab/metrics/influx_db.rb Closes gitlab-ee#6526 See merge request gitlab-org/gitlab-ce!24773
| * | | | | | | | | | | | | | Port this style change from EELin Jen-Shin2019-01-301-3/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ab-54270-github-iid' into 'master'Yorick Peterse2019-01-2914-83/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce amount of locks needed for GitHub importer Closes #54270 and #51817 See merge request gitlab-org/gitlab-ce!24102
| * | | | | | | | | | | | | | Add changelog for performanceAndreas Brandl2019-01-291-0/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Flush InternalId records after importAndreas Brandl2019-01-294-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the import has finished, we flush (delete) the InternalId records related to the project at hand. This means we're starting over with tracking correct internal id values, a new record will be created automatically when the next internal id is generated. The GitHub importer assigns iid values by using supplied values from GitHub. We skip tracking internal id values during the import in favor of higher concurrency. Deleting any InternalId records after the import has finished is an extra measure to guarantee consistency. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54270.
| * | | | | | | | | | | | | | Add migration to cleanup iid recordsAndreas Brandl2019-01-291-0/+43
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert " Trigger iid logic from GitHub importer for merge requests."Andreas Brandl2019-01-292-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fb98496f49bbb324b808523ea97f0844682fe1ac.
| * | | | | | | | | | | | | | Revert "Trigger iid logic from GitHub importer for issues."Andreas Brandl2019-01-292-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b78a69b06c165f7a463d5e0de69030346d9d5c72.
| * | | | | | | | | | | | | | Revert "Trigger iid logic from GitHub importer for milestones."Andreas Brandl2019-01-295-42/+6
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 358675d09f6ba0fdcc4a089c6d1da6df9ff6d092.
* | | | | | | | | | | | | | Merge branch 'add_gitlab_pages_predefined_variables' into 'master'Douglas Barbosa Alexandre2019-01-294-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab Pages predefined variables See merge request gitlab-org/gitlab-ce!24504
| * | | | | | | | | | | | | | Add GitLab Pages predefined variablesAdrian Moisey2019-01-294-0/+23
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'btn-group-secure-group-dashboard' into 'master'Clement Ho2019-01-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport button style changes to CE See merge request gitlab-org/gitlab-ce!24609
| * | | | | | | | | | | | | | Backport button style changes to CEFernando Arias2019-01-291-0/+4
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'tnir/prometheus-metrics-docs' into 'master'Marcia Ramos2019-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo: Prometheus Metrics See merge request gitlab-org/gitlab-ce!24344
| * | | | | | | | | | | | | | Fix typo: Prometheus MetricsTakuya Noguchi2019-01-291-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | Merge branch 'remove-duplicated-show-forms-on-cluster-views' into 'master'Grzegorz Bizon2019-01-295-94/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes duplicated cluster show partials See merge request gitlab-org/gitlab-ce!24654
| * | | | | | | | | | | | | | Removes duplicated cluster show partialsMayra Cabrera2019-01-285-94/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcp/show and user/show partial contain basically the same html elements causing duplication. The difference between the partials is that one of them has html elements disabled if the cluster is managed. This MR aims to remove that duplication by having just a single show partial for both types
* | | | | | | | | | | | | | | Merge branch 'qa-ml-quarantine-diff-patch-spec' into 'master'Mark Lapierre2019-01-291-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine diff patch spec See merge request gitlab-org/gitlab-ce!24769
| * | | | | | | | | | | | | | Quarantine failing testMark Lapierre2019-01-291-1/+4
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: https://gitlab.com/gitlab-org/quality/nightly/issues/42 Also failing in staging until the fix is picked into the next release: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24533