Commit Graph

659 Commits

Author SHA1 Message Date
GitLab Bot c7cb372557 Add latest changes from gitlab-org/gitlab@master 2021-03-01 09:11:01 +00:00
GitLab Bot 7131f9028d Add latest changes from gitlab-org/gitlab@master 2021-02-18 21:10:43 +00:00
GitLab Bot fca2dd4d55 Add latest changes from gitlab-org/gitlab@master 2021-02-18 18:10:41 +00:00
GitLab Bot c0ef148ef3 Add latest changes from gitlab-org/gitlab@master 2021-02-17 18:09:19 +00:00
GitLab Bot b4e854a900 Add latest changes from gitlab-org/gitlab@master 2021-02-16 15:09:50 +00:00
GitLab Bot 3c53fbc50b Add latest changes from gitlab-org/gitlab@master 2021-02-09 12:09:48 +00:00
GitLab Bot 9e74a704bc Add latest changes from gitlab-org/gitlab@master 2021-02-08 12:09:20 +00:00
GitLab Bot b4d79e4b91 Add latest changes from gitlab-org/gitlab@master 2021-02-06 00:09:54 +00:00
GitLab Bot 37a1347df2 Add latest changes from gitlab-org/gitlab@master 2021-01-29 21:09:34 +00:00
GitLab Bot 10cc2d7a72 Add latest changes from gitlab-org/gitlab@master 2021-01-25 15:09:00 +00:00
GitLab Bot fcef382cb9 Add latest changes from gitlab-org/gitlab@master 2021-01-19 09:10:32 +00:00
GitLab Bot ab9c1dbb2d Add latest changes from gitlab-org/gitlab@master 2021-01-13 09:10:52 +00:00
GitLab Bot fd320d0858 Add latest changes from gitlab-org/gitlab@master 2021-01-07 21:10:18 +00:00
GitLab Bot c85cad8c8a Add latest changes from gitlab-org/gitlab@master 2020-12-21 21:10:23 +00:00
GitLab Bot c47247f7cd Add latest changes from gitlab-org/gitlab@master 2020-12-16 21:09:57 +00:00
GitLab Bot fa6089d8ad Add latest changes from gitlab-org/gitlab@master 2020-12-15 03:10:12 +00:00
GitLab Bot 8f143a46fa Add latest changes from gitlab-org/gitlab@master 2020-12-10 15:10:12 +00:00
GitLab Bot 03d56c8af0 Add latest changes from gitlab-org/gitlab@master 2020-12-09 21:09:43 +00:00
GitLab Bot 1361891b0a Add latest changes from gitlab-org/gitlab@master 2020-12-09 12:09:42 +00:00
GitLab Bot 2ddcd634fc Add latest changes from gitlab-org/gitlab@master 2020-11-30 21:09:16 +00:00
GitLab Bot 95ff19a65c Add latest changes from gitlab-org/gitlab@master 2020-11-27 12:09:14 +00:00
GitLab Bot 0d312b8d37 Add latest changes from gitlab-org/gitlab@master 2020-11-24 06:09:49 +00:00
GitLab Bot a662b146ac Add latest changes from gitlab-org/gitlab@master 2020-11-05 12:09:05 +00:00
GitLab Bot d43cf10712 Add latest changes from gitlab-org/gitlab@master 2020-11-03 09:09:07 +00:00
GitLab Bot 8a902a9508 Add latest changes from gitlab-org/gitlab@master 2020-10-22 03:08:25 +00:00
GitLab Bot 731d58455c Add latest changes from gitlab-org/gitlab@master 2020-10-19 06:09:08 +00:00
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot 6ab9cdec26 Add latest changes from gitlab-org/gitlab@master 2020-10-06 12:08:38 +00:00
GitLab Bot a865379008 Add latest changes from gitlab-org/gitlab@master 2020-09-07 12:08:27 +00:00
GitLab Bot 6724a6ee6b Add latest changes from gitlab-org/gitlab@master 2020-09-04 12:08:27 +00:00
GitLab Bot c82ca12a1c Add latest changes from gitlab-org/gitlab@master 2020-08-26 15:10:29 +00:00
GitLab Bot 85f7fa54f4 Add latest changes from gitlab-org/gitlab@master 2020-08-18 18:10:10 +00:00
GitLab Bot 14245e7755 Add latest changes from gitlab-org/gitlab@master 2020-08-12 21:09:54 +00:00
GitLab Bot af28a89d5e Add latest changes from gitlab-org/gitlab@master 2020-07-21 12:09:30 +00:00
GitLab Bot d9aac35d79 Add latest changes from gitlab-org/gitlab@master 2020-07-13 18:09:16 +00:00
GitLab Bot 79040c6178 Add latest changes from gitlab-org/gitlab@master 2020-06-30 18:09:13 +00:00
GitLab Bot 340f15b402 Add latest changes from gitlab-org/gitlab@master 2020-06-30 15:08:48 +00:00
GitLab Bot 1e254d9f5a Add latest changes from gitlab-org/gitlab@master 2020-06-30 12:08:57 +00:00
GitLab Bot ebe92e84a9 Add latest changes from gitlab-org/gitlab@master 2020-06-26 18:09:03 +00:00
GitLab Bot ce493944f4 Add latest changes from gitlab-org/gitlab@master 2020-06-19 18:08:39 +00:00
GitLab Bot 4f584f7b63 Add latest changes from gitlab-org/gitlab@master 2020-06-10 21:09:29 +00:00
GitLab Bot d48cbe1786 Add latest changes from gitlab-org/gitlab@master 2020-06-08 21:09:17 +00:00
GitLab Bot 340fd2966e Add latest changes from gitlab-org/gitlab@master 2020-06-04 00:08:17 +00:00
GitLab Bot 607646ef52 Add latest changes from gitlab-org/gitlab@master 2020-06-03 12:08:21 +00:00
GitLab Bot 4d5ee2b814 Add latest changes from gitlab-org/gitlab@master 2020-05-27 15:08:11 +00:00
GitLab Bot 1902e25626 Add latest changes from gitlab-org/gitlab@master 2020-05-20 21:09:09 +00:00
GitLab Bot 57d1bb8254 Add latest changes from gitlab-org/gitlab@master 2020-05-19 09:08:12 +00:00
GitLab Bot e35f91f05b Add latest changes from gitlab-org/gitlab@master 2020-05-18 15:08:15 +00:00
GitLab Bot c4c1fc5fe7 Add latest changes from gitlab-org/gitlab@master 2020-05-15 15:08:04 +00:00
GitLab Bot 14763e2fc6 Add latest changes from gitlab-org/gitlab@master 2020-05-01 03:09:48 +00:00
GitLab Bot ada214dc52 Add latest changes from gitlab-org/gitlab@master 2020-04-30 09:09:39 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot cd3e2c7b93 Add latest changes from gitlab-org/gitlab@master 2020-02-19 12:09:13 +00:00
GitLab Bot 0eb3d2f799 Add latest changes from gitlab-org/gitlab@master 2020-02-06 15:09:11 +00:00
GitLab Bot c8f773a859 Add latest changes from gitlab-org/gitlab@master 2020-01-30 21:08:47 +00:00
GitLab Bot 411cc77938 Add latest changes from gitlab-org/gitlab@master 2020-01-24 18:09:00 +00:00
GitLab Bot 22a0d312ae Add latest changes from gitlab-org/gitlab@master 2020-01-17 18:08:41 +00:00
GitLab Bot 571d993b49 Add latest changes from gitlab-org/gitlab@master 2020-01-15 18:08:34 +00:00
GitLab Bot eb30dd6e28 Add latest changes from gitlab-org/gitlab@master 2020-01-13 12:08:04 +00:00
GitLab Bot 2b3bfe8fc5 Add latest changes from gitlab-org/gitlab@master 2020-01-08 00:07:43 +00:00
GitLab Bot b4028d4500 Add latest changes from gitlab-org/gitlab@master 2020-01-07 15:07:34 +00:00
GitLab Bot 134fe18200 Add latest changes from gitlab-org/gitlab@master 2019-12-05 21:07:40 +00:00
GitLab Bot 190e204dec Add latest changes from gitlab-org/gitlab@master 2019-11-17 12:06:19 +00:00
GitLab Bot 11faf8ae72 Add latest changes from gitlab-org/gitlab@master 2019-10-23 21:06:17 +00:00
GitLab Bot 869182cab0 Add latest changes from gitlab-org/gitlab@master 2019-10-09 00:06:06 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
manojmj a07efbdfd0 CE: Audit event for archiving and unarchiving projects 2019-08-21 09:12:48 +05:30
Brett Walker 3489dc3d72 Allow disabling group/project email notifications
- Adds UI to configure in group and project settings
- Removes notification configuration for users when
disabled at group or project level
2019-08-15 17:37:36 +00:00
Furkan Ayhan 8476516e3d Separate private methods under the keyword on projects controller 2019-07-28 21:21:31 +03:00
George Thomas a9707e8cf7
Rewrite `if:` argument in before_action and alike when `only:` is also used
Closes #55564
This is first discovered in #54739 (comment 122609857) that if both if: and only:
are used in a before_action or after_action or alike, if: is completely ignored.
2019-07-18 10:04:06 +05:30
Rémy Coutable 9a4b5f08db Merge branch 'sh-fix-issue-63349' into 'master'
Make Housekeeping button do a full garbage collection

Closes #63349

See merge request gitlab-org/gitlab-ce!30289
2019-07-04 07:38:56 +00:00
Stan Hu d48ee86053 Make Housekeeping button do a full garbage collection
Previously the Housekeeping button and API would use the counter of last
pushes to determine whether to do a full garbage collection, or whether
to do one of the less comprehensive tasks: a full repack, incremental
pack, or ref pack. This was confusing behavior, since a project owner
might have to click the button dozens of times before a full GC would be
initiated.

This commit forces a full GC each time this is initiated. Note that the
`ExclusiveLease` in `HousekeepingService` prevents users from clicking
on the button more than once a day.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63349
2019-07-03 00:21:33 -07:00
Alexandru Croitor 09163e423a Expose merge requests count based on user access
Count issues related merge requests based on user access level. And
issue can have related MRs from projects where user does not have
access so the number of related merge requests should be adjusted
based on user's ability to access the related MRs.

https://gitlab.com/gitlab-org/gitlab-ce/issues/59581
2019-06-18 12:46:46 +03:00
Igor Drozdov 3d4821a8e7 Hide password on import by url form 2019-05-29 14:03:50 +03:00
Małgorzata Ksionek 303ec92ab9 Update projects controller 2019-04-16 10:20:57 +02:00
Kamil Trzciński 650f40865e Forbid the use of `#reload` and prefer `#reset`
The `#reload` makes to load all objects into memory,
and the main purpose of `#reload` is to drop the association cache.

The `#reset` seems to solve exactly that case.
2019-04-15 13:05:14 +02:00
Imre Farkas 9bc5ed14fe Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-09 15:38:58 +00:00
Stan Hu 0d8e9f6ee3 Expand FindCommit caching to blob and refs
This enables FindCommit caching to the following actions:

* BlobController#show
* RefsController#logs_tree

It also improves caching in CommitsController since some
duplicate requests were occuring inside the before_action
definitions.
2019-04-06 05:16:22 -07:00
Andreas Brandl 0cf23a7f50 Merge branch 'revert-3962b00b' into 'master'
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"

See merge request gitlab-org/gitlab-ce!27051
2019-04-05 14:28:34 +00:00
Andreas Brandl 46b1b9c1d6 Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
2019-04-05 13:02:56 +00:00
Stan Hu f1dce21609 Enable FindCommit caching for project and commits pages
This reduces a handful of duplicate FindCommit calls while viewing the
projects and commits pages.
2019-04-05 04:52:42 -07:00
Imre Farkas d9d7237d2e Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-05 11:45:47 +00:00
Małgorzata Ksionek b7ecf43388 Add cr remarks 2019-03-25 11:08:20 +01:00
Małgorzata Ksionek 0b324d3463 Disallow changing namespace of a project in update method 2019-03-20 14:52:18 +01:00
Rubén Dávila 24226b9fe2 Update last_activity_on for Users on some main GET endpoints
In order to have an accurate date about the last activity of a User
we need to update the last_activity_on field when the User is visiting
some basic pages of GitLab like pages related to Dashboards, Projects,
Issues and Merge Requests
2019-02-05 09:55:31 -05:00
Dmitriy Zaporozhets f13edec8c7 Add ability to resolve project id into path
By visiting `projects/:id` you will be redirected to project page with
path in it.

projects/123 => foo/bar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-01-22 09:59:10 +02:00
Tiago Botelho 8772bdabb2
Project guests no longer are able to see refs page
Adds download_code authorization check to ProjectsController#refs
action, to prevent a project guest from seeing branch, tags and
commits information
2018-12-19 10:21:02 +00:00
Cindy Pallares fe5f75930e
Merge branch 'security-fix-pat-web-access' into 'master'
[master] Resolve "Personal access token with only `read_user` scope can be used to authenticate any web request"

See merge request gitlab/gitlabhq!2583
2018-11-28 19:13:59 -05:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Tuomo Ala-Vannesluoma c84b60b164 Make GitLab pages support access control 2018-10-05 13:41:11 +00:00
Tiago Botelho 81d949f656 Applies the CE backport of EE#657 2018-09-24 12:02:01 +01:00
gfyoung 73322a0e55 Enable frozen string in app/controllers/**/*.rb
Enables frozen string for the following:

* app/controllers/*.rb
* app/controllers/admin/**/*.rb
* app/controllers/boards/**/*.rb
* app/controllers/ci/**/*.rb
* app/controllers/concerns/**/*.rb

Partially addresses #47424.
2018-09-18 21:22:45 -07:00
James Lopez e72aeccdae Resolve "Unable to import repository: undefined method `import_file' for nil:NilClass" 2018-09-17 10:52:49 +00: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
James Lopez f1277fbf0b
refactor code based on feedback 2018-09-07 14:43:51 +02:00
James Lopez 27442862cf
refactor code based on feedback 2018-09-07 13:42:49 +02:00
James Lopez a2aa505805
Refactor code to remove object storage flag from Import/Export
Updated docs, refactor import/export code
Fix AvatarUploader path issue
Fix project export upload webhook error
2018-09-06 16:52:42 +02:00
Winnie Hellmann 743add978a Move badge settings to general settings 2018-09-03 13:16:23 +00:00
Mike Greiling 0f77d24be8 Keep project settings sections expanded after submitting form 2018-08-08 10:57:34 +00:00
James Ramsay 79d90cb6bd Use Projects::UpdateService to archive projects
System hooks were not being triggered when projects were archived or
unarchived. Reuse the Projects::UpdateService to automatically
trigger system hooks and increase code reuse.
2018-08-03 11:55:21 -04:00
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08:00
James Lopez a2bf164154
Update Import/Export to use object storage (based on aa feature flag) 2018-07-06 15:46:18 +02:00
Imre Farkas 9561db7b8c
Add option to add README when creating a project 2018-07-04 17:35:23 +02:00
Aram Visser 0d22b2141f Set flash error message only for current request when updating project 2018-06-25 10:19:13 +07:00
Hiroyuki Sato 59154779d8 The json keys of ref switcher should not be translated 2018-06-20 13:02:08 +09:00
blackst0ne eddf3febd7 [Rails5] Add `safe_params` helper
Rails 5.0 requires to explicitly permit attributes when building a URL
using current `params` object.

The `safe_params` helper allows developers to just call `safe_params.merge(...)`
instead of manually adding `permit` to every call.

https://github.com/rails/rails/pull/20868
2018-04-08 15:35:30 +11:00
Tomasz Maczukin 99caa5bb04
Use ChronicDurationAttribute to handle CI/CD timeout setting 2018-04-04 19:47:37 +02:00
Robert Speicher 2e87923dcb Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'
Create CI/CD-only projects by URL -- CE backport

See merge request gitlab-org/gitlab-ce!17342
2018-03-05 22:43:27 +00:00
Eric Eastwood 32d121343d CI/CD-only projects FE
See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839

Conflicts:
	app/assets/javascripts/projects/project_new.js
	app/views/shared/_import_form.html.haml
	ee/app/controllers/ee/projects_controller.rb
	ee/spec/features/projects/new_project_spec.rb
	locale/gitlab.pot
2018-03-05 13:26:34 -06:00
Dmitriy Zaporozhets 8fe9995f11
Replace deprecated name_with_namespace with full_name in app and spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-05 16:15:26 +02:00
Eric Eastwood 8ae57909a1 Backport BE changes from CI/CD projects ee!4567
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567
2018-03-02 17:17:05 -06:00
Phil Hughes 981b5905a0 Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'
Keep "Import project" tab/form active when validation fails trying to import  "Repo by URL"

Closes #43261

See merge request gitlab-org/gitlab-ce!17136
2018-02-23 09:18:48 +00:00
Oswaldo Ferreira a8c523d98b Move project presenter instance creation to controller 2018-02-22 13:59:14 -03:00
Sean McGivern c2fc40668c Refactor IssuableFinder to extract model-specific logic
By extracting a new `filter_items` method, we can override that in the
IssuesFinder and MergeRequestsFinder separately, so we don't need checks that
the model is the correct one, because we can just use the class we're in to know
that.

We can do the same for the VALID_PARAMS constant, by making it a class method.
2018-02-21 10:31:29 +00:00
Eric Eastwood 2aacb7fb43 Make import tab/form active when importing project by URL and validation fails
See https://gitlab.com/gitlab-org/gitlab-ce/issues/43261
2018-02-20 13:06:13 -06:00
Rémy Coutable 4d64524b0d Merge branch 'query-counts' into 'master'
Track and act upon the number of executed SQL queries

See merge request gitlab-org/gitlab-ce!16466
2018-02-05 10:04:43 +00:00
Mario de la Ossa eaada9d706 use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
Yorick Peterse cca61980d5
Track and act upon the number of executed queries
This ensures that we have more visibility in the number of SQL queries
that are executed in web requests. The current threshold is hardcoded to
100 as we will rarely (maybe once or twice) change it.

In production and development we use Sentry if enabled, in the test
environment we raise an error. This feature is also only enabled in
production/staging when running on GitLab.com as it's not very useful to
other users.
2018-02-01 17:00:46 +01:00
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
Jacob Vosmaer 176b60d110 Remove the Project#repo method 2018-01-04 18:38:39 +01:00
Douwe Maan 1baea77438 Merge branch 'lfs-badge' into 'master'
Added LFS badge to indicate LFS tracked files

Closes #15567

See merge request gitlab-org/gitlab-ce!15845
2017-12-15 09:02:24 +00:00
Phil Hughes cbd3ce8f41
moved lfs_blob_ids method into ExtractsPath module 2017-12-14 11:59:01 +00:00
Phil Hughes 7d2affeff1
moved lfs blob fetch from extractspath file 2017-12-14 10:10:20 +00:00
Douwe Maan d332c8c78a Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into 'security-10-2'
Fixes project visibility guidelines

See merge request gitlab/gitlabhq!2226

(cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c)

e4fd1c26 Ensure project wiki visibility guidelines are met
2017-12-08 13:44:36 -08:00
Jan Provaznik 8cce70730c Create merge request from email
* new merge request can be created by sending an email to the specific
email address (similar to creating issues by email)
* for the first iteration, source branch must be specified in the mail
subject, other merge request parameters can not be set yet
* user should enable "Receive notifications about your own activity" in
user settings to receive a notification about created merge request

Part of #32878
2017-12-05 08:41:58 +01:00
Jacopo 181cd299f9 Adds Rubocop rule for line break after guard clause
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
2017-11-16 17:58:29 +01:00
Jarka Kadlecova ad6e650262 Refactor issuables index actions 2017-11-07 14:34:12 +01:00
Francisco Javier López bf0331dc72 Resolve "DashboardController#activity.json is slow due to SQL" 2017-11-06 16:52:56 +00:00
Stan Hu 891a9ce8b0 Merge branch 'master' into sh-security-fix-backports-master 2017-10-17 16:02:32 -07:00
Jen-Shin Lin bd46c8abfd Merge branch 'security-10-1' into '10-1-stable'
Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209
2017-10-17 15:58:58 -07:00
Winnie Hellmann fc68a3aeaf Change project deletion message from alert to notice 2017-10-17 16:44:34 +00:00
Vitaliy @blackst0ne Klachkov 64bb19069d Add support for markdown preview to group milestones 2017-10-11 20:03:19 +11:00
Valery Sizov 7af585f166 Fast forward merge: basic implemenation[ci skip] 2017-09-19 23:48:40 -05:00
Ashley Dumaine a3f76b76a4 change collapse to resolve and comments to discussions 2017-09-06 10:07:47 +01:00
Ashley Dumaine ef4b3a39bc Add functionality to collapse outdated diff comments regardless of discussion resolution 2017-09-06 10:07:46 +01:00
Rubén Dávila b9b0b37b36 Add check for access to Namespace 2017-08-30 12:24:49 -05:00
Rubén Dávila 6f03ddcdc3 Address some suggestions from first code review 2017-08-29 00:53:35 -05:00
Rubén Dávila b63c08b263 Build Project in context of Namespace if available 2017-08-26 03:31:14 -05:00
Robin Bobbitt 649d042dbc Add option to disable project export on instance 2017-08-11 12:22:37 -04:00
Yorick Peterse aac1de46c9
Use a specialized class for querying events
This changes various controllers to use the new EventCollection class
for retrieving events. This class uses a JOIN LATERAL query on
PostgreSQL to retrieve queries in a more efficient way, while falling
back to a simpler / less efficient query for MySQL.

The EventCollection class also includes a limit on the number of events
to display to prevent malicious users from cycling through all events,
as doing so could put a lot of pressure on the database.

JOIN LATERAL is only supported on PostgreSQL starting with version 9.3.0
and as such this optimisation is only used when using PostgreSQL 9.3 or
newer.
2017-08-10 17:45:49 +02:00
Mike Greiling 0994bbf9dd Merge branch 'master' into ide
* master: (86 commits)
  Show all labels
  33874 confidential issue redesign
  Exclude merge_jid on Import/Export attribute configuration
  Resolve "User dropdown in filtered search does not load avatar on `master`"
  Re-add column locked_at on migration rollback
  Group-level new issue & MR using previously selected project
  [EE Backport] Update log audit event in omniauth_callbacks_controller.rb
  more eagerly bail when the state is prevented
  Move locked_at removal to post-deployment migration
  Add class to other sidebars
  Improve mobile sidebar
  reduce iterations by keeping a count of remaining enablers
  Store & use ConvDev percentages returned by Version app
  Store MergeWorker JID on merge request, and clean up stuck merges
  Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
  DRY up caching in AbstractReferenceFilter
  Update CHANGELOG
  Add CHANGELOG entry
  Fix html structure Removes test for removed behavior
  Port form back to use form_tag
  ...
2017-08-07 22:44:47 -05:00
Z.J. van de Weg db65499e26
Fix last feature test for project templates 2017-08-07 15:32:43 +02:00
Z.J. van de Weg 2e6aa4f25e
After merge cleanup 2017-08-07 15:09:14 +02:00
Filipa Lacerda 3b9012871d Merge branch 'master' into zj-project-templates
* master: (623 commits)
  Fix issues with pdf-js dependencies
  fix missing changelog entries for security release on 2017-01-23
  Update top bar issues icon
  Fix pipeline icon in contextual nav for projects
  Since mysql is not a priority anymore, test it less
  Fix order of CI lint ace editor loading
  Add container registry and spam logs icons
  Fix different Markdown styles
  Backport to CE for:
  Make new dropdown dividers full width
  Fix spec
  Fix spec
  Fix spec
  Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
  Add changelog
  Install yarn via apt in update guides
  Use long curl options
  fix
  Add a spec for concurrent process
  Remove monkey-patched Array.prototype.first() and last() methods
  ...
2017-08-07 11:09:50 +01:00
Douwe Maan ef6ce7a9ec More backend cleanup 2017-08-03 15:23:43 +02:00
Luke "Jared" Bennett 3b431cc08c
Fix UselessAssignment offense in projects_controller 2017-08-01 15:41:18 +01:00
Luke "Jared" Bennett 4c53ef321e
Fix rubocop 2017-08-01 14:52:01 +01:00
Z.J. van de Weg 3baf3dc955
Rename GitLabProjectImporterService and misc fixes
First round of review, main changes:
- templates.title is human readable, #name will be passed around
- GitLabProjectImporterService has been renamed
2017-08-01 14:36:42 +02:00
Jacob Schatz a3fe09e0c6 Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide 2017-07-28 15:47:54 -04:00
Jacob Schatz 3909c6c06c Adds new ruby help for dropdowns for branches 2017-07-28 13:36:07 -04:00
Z.J. van de Weg 1d3815f89b
Allow projects to be started from a template
Started implementation for the first iteration of
gitlab-org/gitlab-ce#32420. This will allow users to select a template
to start with, instead of an empty repository in the project just
created.

Internally this is basically a small extension of the ImportExport
GitLab projects we already support. We just import a certain import
tar archive. This commits includes the first one: Ruby on Rails. In the
future more will be added.
2017-07-28 11:32:46 +02:00
Nick Thomas e4391c7190 Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 2017-07-21 18:45:12 +01:00
Grzegorz Bizon 613208c360 Recover from renaming project that has container images 2017-07-13 15:34:36 +02:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Tiago Botelho 8e8eb97861 Removes pending delete from filter scopes 2017-06-28 11:29:59 +01:00
Tieu-Philippe KHIM 3c1700cde6 Refactor atom builder by using xml.atom layout 2017-06-12 19:21:13 +02:00
Bob Van Landuyt bdebe849b8 Translate project & repository pages 2017-06-07 20:13:44 +00:00
blackst0ne a544e46bb0 Add a rubocop rule to check if a method 'redirect_to' is used without explicitly set 'status' in 'destroy' actions of controllers 2017-06-07 09:45:16 +11:00
Valery Sizov 2158beddee Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 17489-hide-code-from-guests 2017-05-23 14:10:16 +03:00
Michael Kozono 49697bc8df Refactor to more robust implementation
In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change:

When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`.
2017-05-19 09:13:27 -07:00
Rémy Coutable d40e1f547e Enable the Style/TrailingCommaInLiteral cop
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
James Clark c0632f1463 Hide clone panel and file list when user is only a guest
Fixes gitlab-org/gitlab-ce#17489

Fix test finding two of the same element

Capybara will raise an exception because it finds two elements that
match .nav-links. This means this test would fail, even if the page
meets the conditions for passing the test.

Add more tests for guest access
2017-05-07 11:26:52 -04:00
Rares Sfirlogea 45e4c66565 Display slash commands outcome when previewing Markdown
Remove slash commands from Markdown preview and display their outcome next to
the text field.
Introduce new "explanation" block to our slash commands DSL.
Introduce optional "parse_params" block to slash commands DSL that allows to
process a parameter before it is passed to "explanation" or "command" blocks.
Pass path for previewing Markdown as "data" attribute instead of setting
a variable on "window".
2017-05-04 17:02:25 +02:00
Jarka Kadlecova 87327c5845 Support preview_markdown action for personal_snippets 2017-04-26 12:51:06 +02:00
Dmitriy Zaporozhets e585b77730 Change project view default for existing users and anonymous visitors to files+readme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-04-10 21:28:41 +03:00
Alex Sanford 68e3fa0e58 Add ability to disable Merge Request URL on push 2017-03-17 12:35:39 +00:00
Rémy Coutable 5069255681 Merge branch 'fix-project-without-repo-and-wiki' into 'master'
Fix projects without repo and wiki

Closes #29542

See merge request !9956
2017-03-16 08:51:49 +00:00
Lin Jen-Shin 668a5b9fe1 Fix projects without repo and wiki
When repo and wiki are disabled for a project,
we're showing issues so we'll need to set @issuable_meta_data
otherwise it would be giving nil errors. See:

https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/23106/
2017-03-15 14:42:02 +08:00
Mark Fletcher 3a6c7a2df3 Display full project name with namespace upon deletion
* Removes ambiguity when two projects exist with the same name
2017-03-15 09:37:57 +05:30
James Lopez a0101ebf84 Update occurrences of MWBS to MWPS
Rename column in the database
 Rename fields related to import/export feature
 Rename API endpoints
 Rename documentation links
 Rename the rest of occurrences in the code
 Replace the images that contain the words "build succeeds" and docs referencing to them
 Make sure pipeline is green and nothing is missing.

updated doc images

renamed only_allow_merge_if_build_succeeds in projects and fixed references

more updates

fix some spec failures

fix rubocop offences

fix v3 api spec

fix MR  specs

fixed issues with partials

fix MR spec

fix alignment

add missing v3 to v4 doc

wip - refactor v3 endpoints

fix specs

fix a few typos

fix project specs

copy entities fully to V3

fix  entity error

more fixes

fix failing specs

fixed missing entities in V3 API

remove comment

updated code based on feedback

typo

fix spec
2017-03-01 12:02:02 +01:00
Jacob Schatz 806b038a44 Merge branch 'ref-switcher-perf' into 'master'
Improved ref switcher dropdown performance

Closes #18202

See merge request !7239
2017-02-03 15:03:57 +00:00
Rémy Coutable 7485cec94e
Add a spec and actually display the flash notice
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-16 10:57:15 -05:00
sandish chen 81f7a7ab62 Fix to display notice when project settings updated.
Change validity checking for UpdateService.

Add return value for project update service.

Return 302(redirect_to) when successfully updated.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-15 01:31:25 -05:00
Luke Bennett 1356e40f22
Changed autocomplete_sources into an action that returns a single 'at' type of sources at a time
Finished up autocomplete_sources action and added frontend to fetch data only when its needed

Added wait_for_ajax to specs

Fixed builds and improved the setup/destroy lifecycle

Changed global namespace and DRYed up loading logic

Added safety for accidentally loading data twice

Removed destroy as its not necessary and is messing with click events from a blur race condition

Created AutocompleteSourcesController and updated routes

Fixed @undefined from tabbing before load ends

Disable tabSelectsMatch until we have loaded data

Review changes
2016-12-15 15:20:33 +00:00
Phil Hughes f9750b4912 Changed how the data is returned - we only care about the branch/tag name 2016-11-21 21:01:45 -05:00
Phil Hughes ba2089e017 Uses take rather than Kaminari 2016-11-21 21:01:45 -05:00
Phil Hughes 1a21fa26f6 Improved ref switcher dropdown performance
Closes #18202
2016-11-21 21:01:45 -05:00
Douwe Maan 6b35c4ad65 Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'"
This reverts merge request !6796
2016-11-17 09:39:23 +00:00
Akram FARES d54b88260c Limit autocomplete to currently selected items 2016-11-15 21:41:40 +00:00
Rémy Coutable f00a08c35b Merge branch 'rs-project_params' into 'master'
Apply `*_params_ce` pattern to ProjectsController

See merge request !7338
2016-11-08 17:51:47 +00:00
Douwe Maan 9c3f3e9e35 Merge branch 'use-separate-token-for-incoming-email' into 'master'
Use separate email-friendly token for incoming email

See merge request !5914
2016-11-08 10:47:45 +00:00
Robert Speicher d59956afc0 Apply `*_params_ce` pattern to ProjectsController 2016-11-07 17:55:20 +00:00
tiagonbotelho 011e561bfa implements reset incoming email token on issues modal and account page,
reactivates all tests and writes more tests for it
2016-11-07 15:56:18 +00:00
Dmitriy Zaporozhets 314ef63014
Fix project index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-07 16:13:31 +02:00
Rémy Coutable 3f02914460 Complete and improve specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
Rodolfo Santos 1db9f826c1 Add setting to only allow merge requests to be merged when all discussions are resolved
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
Adam Niedzielski f6cff8f7bc Fix relative links in Markdown wiki when displayed in "Project" tab
Refers to #23806.
2016-11-01 10:18:49 +01:00
Phil Hughes 07e4ffd708 Fixed boards store spec 2016-10-28 13:54:36 +01:00
Phil Hughes a2e9bc3584 Delete issue board welcome cookie when project is new 2016-10-28 13:54:36 +01:00
Felipe Artur da07c2e4d3 Add visibility level to project repository 2016-10-17 18:12:18 -02:00
Rémy Coutable 56259155d5 Small improvements thanks to Robert's feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-30 12:02:54 +02:00
James Lopez 29141ed3ea fix broken repo 500 errors in UI and added relevant specs 2016-09-29 16:58:14 +02:00
Felipe Artur 892dea6771 Project tools visibility level 2016-09-01 11:47:59 -03:00
Patricio Cano cf37d623e1 Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes. 2016-08-30 17:17:45 -05:00
Patricio Cano 9d8fbcc038 Added project specific enable/disable setting for LFS 2016-08-30 16:17:41 -05:00
winniehell ddbdf4e609 Restore get_id in ExtractsPath 2016-08-24 12:54:16 +02:00
Sean McGivern 1a7c293c2d Fix file links on project page Files view 2016-08-23 11:01:20 +01:00
Douwe Maan 8b8a4626c6 Fix specs and implement fixes based on failing specs 2016-08-17 17:54:24 -05:00