summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Add ellipsis to Web IDE commit buttonjr-48133-web-ide-commit-ellipsisJames Ramsay2018-06-202-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The blue shortcut commit button opens the commit interface to actually perform the commit. The ellipsis indicates the button doesn't immediately perform the commit.
* | | | | | | | | Merge branch 'improve-scripts-trigger-build' into 'master'Robert Speicher2018-06-201-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore GitLab API hiccups in scripts/trigger-build See merge request gitlab-org/gitlab-ce!20038
| * | | | | | | | | Ignore GitLab API hiccups in scripts/trigger-buildimprove-scripts-trigger-buildRémy Coutable2018-06-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch ↵Robert Speicher2018-06-202-2/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964' into 'master' Resolve "qa/specs/features/login/ldap_spec.rb is failing after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19964" Closes #48159 See merge request gitlab-org/gitlab-ce!20027
| * | | | | | | | | | [QA] Fix qa/qa/specs/features/login/ldap_spec.rb48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964Rémy Coutable2018-06-202-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'unify-lib-tasks' into 'master'Robert Speicher2018-06-202-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify flay.rake and gettext.rake from EE See merge request gitlab-org/gitlab-ce!20041
| * | | | | | | | | | | Unify flay.rake and gettext.rake from EEunify-lib-tasksLin Jen-Shin2018-06-212-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '47488-remove-unmergeable-notification-for-no-commits' into ↵Robert Speicher2018-06-209-70/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Notify only merge request unmergeable due to conflict See merge request gitlab-org/gitlab-ce!19548
| * | | | | | | | | | | Fix possiblilty of branch not found47488-remove-unmergeable-notification-for-no-commitsMark Chao2018-06-201-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now can happen because can_be_merged? is called during MR merge_status transition to cannot_be_merged. It is possible branch_name is invalid.
| * | | | | | | | | | | Notify only when unmergeable due to conflictMark Chao2018-06-208-68/+28
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is still the edge case when 'no commits' changes to 'conflict' would not trigger notification, which we ignore for now. Calling can_be_merged? can cause exception (e.g. non-UTF8) Ignore those by rescueing. Remove unmergeable_reason as now only conflict is notified Update spec
* | | | | | | | | | | Merge branch 'project_wiki_scenario_automation' into 'master'Rémy Coutable2018-06-2022-70/+314
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Wiki Scenario Automation gitlab-qa#263 Closes gitlab-qa#263 See merge request gitlab-org/gitlab-ce!19568
| * | | | | | | | | | Added Wiki Scenario Automation gitlab-qa#263Ramya A2018-06-2022-70/+314
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '47964-custom-logo-rendering-improperly-on-sign-in-page-2' into ↵Mike Greiling2018-06-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Custom logo rendering improperly on sign-in page" Closes #47964 See merge request gitlab-org/gitlab-ce!20037
| * | | | | | | | | | Fix navigation bar center logo for custom logosClement Ho2018-06-201-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rs-platform-feature-spec-parity' into 'master'Rémy Coutable2018-06-201-2/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the stubbed methods for SAML authorize paths more specific See merge request gitlab-org/gitlab-ce!20009
| * | | | | | | | | | Make the stubbed methods for SAML authorize paths more specificrs-platform-feature-spec-parityRobert Speicher2018-06-191-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Globally stubbing any instance of `Object` seems like a very bad idea, and it led to test failures here: - https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/76025159 - https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/76024972
* | | | | | | | | | | Merge branch '6165-migrate-ee-specific-code' into 'master'Rémy Coutable2018-06-202-10/+55
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport code from gitlab-ee!6182 See merge request gitlab-org/gitlab-ce!20001
| * | | | | | | | | | | Backport code from gitlab-ee!6182Lukas Eipert2018-06-202-10/+55
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'limit-metrics-content-type' into 'master'Stan Hu2018-06-203-3/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the action suffixes in transaction metrics See merge request gitlab-org/gitlab-ce!20032
| * | | | | | | | | | | Limit the action suffixes in transaction metricslimit-metrics-content-typeYorick Peterse2018-06-203-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be a lot of cases where the suffix of an action (e.g. ".html") is set to bogus data, such as "*/*" or entire URLs. This can increase cardinality of our metrics, and isn't very useful for monitoring and filtering. To work around this, we enforce a whitelist containing a few suffixes we actually care about. Suffixes not supported will be grouped under the action without a suffix. This means that a request to "FooController#bar.jpeg" will be assigned to "FooController#bar".
* | | | | | | | | | | | Merge branch 'remove-allocations-gem' into 'master'Stan Hu2018-06-208-29/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029
| * | | | | | | | | | | Remove remaining traces of the Allocations Gemremove-allocations-gemYorick Peterse2018-06-208-29/+5
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem.
* | | | | | | | | | | Merge branch 'highlight-cluster-settings-message' into 'master'Rémy Coutable2018-06-202-2/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlight cluster settings message Closes #41274 See merge request gitlab-org/gitlab-ce!19996
| * | | | | | | | | | | Highlight cluster settings messageGeorge Tsiolis2018-06-192-2/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-06-202-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48153-date-selection-dialog-broken-when-creating-a-new-milestone' into 'master' Resolve "Date selection dialog broken when creating a new milestone" Closes #48153 See merge request gitlab-org/gitlab-ce!20033
| * | | | | | | | | | | Prevent browser autocomplete for milestone date fieldsMark Fletcher2018-06-202-2/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'leipert-eslint-report-unused-directives' into 'master'Mike Greiling2018-06-20100-130/+105
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use eslint to find unused directives See merge request gitlab-org/gitlab-ce!19940
| * | | | | | | | | | | | ensure that `import/no-unresolved` does not trigger for our fixture filesleipert-eslint-report-unused-directivesLukas Eipert2018-06-205-8/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | remove all unused eslint-disable rulesLukas Eipert2018-06-2094-120/+99
| | | | | | | | | | | | |
| * | | | | | | | | | | | report unused disabled eslint directivesLukas Eipert2018-06-201-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'revert-80044bda' into 'master'Clement Ho2018-06-202-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'" Closes #48171 See merge request gitlab-org/gitlab-ce!20035
| * | | | | | | | | | | | Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'"Clement Ho2018-06-202-6/+0
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts merge request !19873
* | | | | | | | | | | | Merge branch 'docs/48075-milestone-labels-can-be-confusing' into 'master'47964-custom-logo-rendering-improperly-on-sign-in-pageMek Stittri2018-06-201-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Milestone labels can be confusing" Closes #48075 See merge request gitlab-org/gitlab-ce!19980
| * | | | | | | | | | | Resolve conflicts with latest workflow label changesMek Stittri2018-06-20138-804/+1210
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bvl-errors-in-static-analysis' into 'master'Sean McGivern2018-06-202-13/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates to the `gettext:updated_check` Closes #48113 See merge request gitlab-org/gitlab-ce!20002
| * | | | | | | | | | | | More verbose errors in static-analysisBob Van Landuyt2018-06-202-13/+30
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the output in static analysis a bit more verbose.
* | | | | | | | | | | | Merge branch 'zj-can-be-merged' into 'master'Douwe Maan2018-06-203-44/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move mergablility check to Gitaly Closes gitaly#889 See merge request gitlab-org/gitlab-ce!20019
| * | | | | | | | | | | | Move mergablility check to Gitalyzj-can-be-mergedZeger-Jan van de Weg2018-06-203-44/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/889
* | | | | | | | | | | | | Merge branch 'fix/favicon-cross-origin' into 'master'Douwe Maan2018-06-203-5/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Serve favicon image always from the main GitLab domain to avoid issues with CORS Closes #47802 See merge request gitlab-org/gitlab-ce!19810
| * | | | | | | | | | | | | Fix: Serve favicon image always from the main GitLab domain to avoid issues ↵Alexis Reigel2018-06-203-5/+35
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with CORS
* | | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-06-203-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled' into 'master' Operations and Kubernetes option should be omitted when repository or builds are disabled Closes #47631 See merge request gitlab-org/gitlab-ce!19835
| * | | | | | | | | | | | | Operations and Kubernetes items are now omitted in the sidebar when ↵47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabledTiago Botelho2018-06-203-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repository or builds are disabled
* | | | | | | | | | | | | | Merge branch 'sh-bump-rugged-0.27.2' into 'master'Rémy Coutable2018-06-202-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rugged to 0.27.2 See merge request gitlab-org/gitlab-ce!20026
| * | | | | | | | | | | | | Bump rugged to 0.27.2sh-bump-rugged-0.27.2Stan Hu2018-06-202-1/+6
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.2
* | | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-06-202-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes' into 'master' Resolve "[Rails5] Found new routes that could cause conflicts with existing namespaced routes" Closes #48010 See merge request gitlab-org/gitlab-ce!20015
| * | | | | | | | | | | | | [Rails5] Fix ActionCable '/cable' mountpoint conflictblackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routesblackst0ne2018-06-202-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 5.0 the new framework has been added. It's called ActionCable. It brings WebSockets support to rails applications. By default the mountpoint of WebSocket requests is `/cable` [1]. GitLab allows using top level names as namespaces or usernames. For example, `gitlab.com/cable` at this moment leads to a user with the nickname `cable`. This commit changes ActionCable's mountpoint to a reserved top level word `-`. This is just a stub and should not be be used in real work. Please set correct mountpoints for each environments when configuring ActionCable for real using. [1]: https://github.com/rails/rails/blob/5-0-stable/actioncable/lib/action_cable.rb#L38
* | | | | | | | | | | | | | Merge branch 'docs/profile-preferences' into 'master'Marcia Ramos2018-06-201-17/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the profile preferences docs See merge request gitlab-org/gitlab-ce!20031
| * | | | | | | | | | | | | | Refactor the profile preferences docsAchilleas Pipinellis2018-06-201-17/+9
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'docs-clarify-API-share-project-to-group' into 'master'Achilleas Pipinellis2018-06-202-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs clarify API to share project to a group See merge request gitlab-org/gitlab-ce!19301
| * | | | | | | | | | | | | | Docs clarify API to share project to a groupdocs-clarify-API-share-project-to-groupAndrew Winata2018-06-012-1/+5
| | | | | | | | | | | | | | |
View Lorry Controller Status