Commit Graph

377 Commits

Author SHA1 Message Date
GitLab Bot 20de59fb35 Add latest changes from gitlab-org/gitlab@master 2020-08-04 21:09:56 +00:00
GitLab Bot ce493944f4 Add latest changes from gitlab-org/gitlab@master 2020-06-19 18:08:39 +00:00
GitLab Bot 2e2cd0ea3e Add latest changes from gitlab-org/gitlab@master 2020-06-02 00:08:07 +00:00
GitLab Bot 48650fe1bf Add latest changes from gitlab-org/gitlab@master 2020-05-18 12:08:08 +00:00
GitLab Bot f505025346 Add latest changes from gitlab-org/gitlab@master 2020-04-08 09:09:43 +00:00
GitLab Bot 219eead23f Add latest changes from gitlab-org/gitlab@master 2020-03-10 18:08:17 +00:00
GitLab Bot 015663b70f Add latest changes from gitlab-org/gitlab@master 2020-01-06 21:07:43 +00:00
GitLab Bot 10d0e5693c Add latest changes from gitlab-org/gitlab@master 2019-12-03 00:06:28 +00:00
GitLab Bot b42f312df5 Add latest changes from gitlab-org/gitlab@master 2019-11-13 21:06:45 +00:00
GitLab Bot 6e3880e2bb Add latest changes from gitlab-org/gitlab@master 2019-11-12 21:06:30 +00:00
GitLab Bot d2ffc30fd5 Add latest changes from gitlab-org/gitlab@master 2019-10-16 12:06:32 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Ahmad Sherif 3c2b4a1ced Enable serving static objects from an external storage
It consists of two parts:

1. Redirecting users to the configured external storage
1. Allowing the external storage to request the static object(s)
   on behalf of the user by means of specific tokens

Part of https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6829
2019-09-10 13:43:11 +02:00
Douwe Maan 28e1739a3f Port EE System Header And Footer feature to CE
remove EE specific code
remove EE licence checks
move migration from EE to CE folder structure
move specs from EE to CE folder structure
remove EE specific flag specs
2019-02-21 17:55:51 +02:00
Kushal Pandya 9cce812af9 Add `client_detection` helper to add browser and plaform flags 2019-01-22 14:07:46 +05:30
Heinrich Lee Yu 7d1a7261f0 Change `page_filter_path` default behavior
`label_name` is now not excluded by default

Also removed `label: true` from calls to the helper
2018-12-14 12:58:40 +08:00
Heinrich Lee Yu 2a53198324 Refactor whitelisting of filter params 2018-11-15 01:12:07 +08:00
Heinrich Lee Yu 2ade9b4479 Added wip param in filter path options 2018-11-13 15:27:42 +08:00
Heinrich Lee Yu 91d88d10c7 Clean up page_filter_path 2018-11-13 15:27:42 +08:00
Heinrich Lee Yu 91f235df08 Fix tests 2018-11-13 15:27:42 +08:00
Fabian Schneider b55c320c89 Resolve "Drop down filter for project snippets" 2018-10-05 09:42:38 +00:00
Dmitriy Zaporozhets 00057a75f4 Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'
Resolve "Split admin settings into multiple sub pages"

Closes #44998

See merge request gitlab-org/gitlab-ce!21467
2018-09-20 13:24:20 +00:00
Gabriel Mazetto 11f70e0f08 Improve TabHelper to clarify the use of Namespaces for the nav_link 2018-09-18 16:12:37 +00:00
Martin Wortschack 68ac430af9 Rename helper method 2018-09-18 10:43:19 +02:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Martin Wortschack 48ee697bf2 remove 'Geo' and 'Templates' template from CE and display menu items for EE only 2018-09-11 17:26:15 +02:00
gfyoung 1993a4449a Enable frozen string for app/helpers/**/*.rb
Partially addresses #47424.
2018-09-06 17:33:46 -07:00
Kushal Pandya c2939c714d Fix merge requests data source key to be camelCase 2018-06-27 16:31:56 +05:30
Lin Jen-Shin 4634e749ee CE: Use render_if_exists to hide EE specific codes 2018-05-23 12:56:11 +00:00
Douwe Maan 67c9f822dd Merge branch '4084-epics-username-autocomplete-ce' into 'master'
Backport CE changes from "autocomplete usernames in Epic comments/description"

See merge request gitlab-org/gitlab-ce!18605
2018-05-07 08:26:44 +00:00
Mario de la Ossa 5c2078838b
Backport of 4084-epics-username-autocomplete 2018-05-04 11:33:09 -06:00
Douwe Maan fcc41fe396
Fix commit trailer rendering when Gravatar is disabled 2018-04-25 17:32:51 +02:00
Jan Provaznik c1b71e2fa1 Check if at least one filter is set on dashboard
When listing issues and merge requests on dasboard page,
make sure that at least one filter is enabled.

User's id is used in search autocomplete widget instead
of username, which allows presetting user in filter dropdowns.

Related to #43246
2018-04-03 20:19:09 +02:00
André Luís f8049f4e26 Backport changes in EE MR 4972: System Header and Footer 2018-04-02 14:27:12 +00:00
Toon Claes 9ab43aa762 Add read-only banner to all pages
When the database is in a read-only state, display a banner on each
page informing the user they cannot write to that GitLab instance.

Closes gitlab-org/gitlab-ce#43937.
2018-03-22 20:34:45 +01:00
Robert Speicher e118487c2a Remove `www.` from `twitter_url` helper
Twitter redirects `www.twitter.com` to `twitter.com`

Also removes unnecessary regex escapes, just 'cause.
2018-03-19 12:53:20 -05:00
Phil Hughes 148cc3c21b
removed helper methods 2018-03-02 08:42:03 +00:00
Oswaldo Ferreira 31d1b2ca8c Simplify project check with duck typing 2018-02-22 13:59:15 -03:00
Eric Eastwood 2e29597c94 Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projects 2018-02-22 09:34:44 -06:00
Oswaldo Ferreira e0e3f1c275 Move button list logic to project presenter 2018-02-20 13:03:06 -03:00
Andreas Brandl dd1d13b859 Extract repeated logic into #avatar_icon_for.
This essentially allows to pass both user and email, so that we can
either prefer the user to retrieve the avatar or (if user is not
present) fall back to the email lookup.
2018-02-13 18:04:53 +01:00
Andreas Brandl c4cf722014 Remove generic #avatar_icon helper. 2018-02-13 18:04:52 +01:00
Andreas Brandl f338ff43c1 Refactor and split ApplicationHelper#avatar_icon.
When we don't use the original `ApplicationHelper#avatar_icon` anymore, we
can just remove it (and its specs).

Closes #42800.
2018-02-13 18:04:50 +01:00
Felix Geyer 94039bd7ca Make default_avatar return a full path.
Callers expect a URL.

This fixes the avatars in commit lists when a user has no avatar and
Gravatar is disabled.

Closes #38715
2018-01-28 17:39:22 +01:00
Tim Zallmann 213e91d439 Resolve "Decouple multi-file editor from file list" 2017-12-21 15:05:47 +00:00
Bob Van Landuyt 939469cda3 Build the locale path with an `_` instead of a `-`
The locale code is turned into an asset path with an underscore
instead of a dash.

The language codes are transformed by `I18n.locale` into a code with a
dash. But the resources for translating are always stored in a path
using a `_` separating the language and the region code.
2017-10-18 13:10:35 +02:00
Phil Hughes ddb3692a22 Clean up new navigation templates 2017-09-06 10:58:24 +00:00
Tim Zallmann 989bebbf01 Merge branch 'enable-new-navigaton-by-default' into 'master'
Enable the new navigation by default

See merge request !13387
2017-09-01 08:11:46 +00:00
Sean McGivern 5883ce95ef `current_application_settings` belongs on `Gitlab::CurrentSettings`
The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.

To fix this:

1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
   `Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
   like that in several places.
3. Change the initializers to use that new form.
2017-08-31 13:38:33 +01:00
Phil Hughes 4d2d744ae9 Merge branch 'master' into enable-new-navigaton-by-default 2017-08-30 16:49:22 +01:00