Commit Graph

411 Commits

Author SHA1 Message Date
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