Commit Graph

4137 Commits

Author SHA1 Message Date
Markus Koller 257fd57134 Allow password authentication to be disabled entirely 2017-11-23 13:16:14 +00:00
Filipa Lacerda 4563156256 Improve environments performance 2017-11-23 12:04:03 +00:00
Clement Ho f553405901 Merge branch '28377-add-edit-button-to-mobile-file-view' into 'master'
Add edit button to mobile file view

Closes #28377

See merge request gitlab-org/gitlab-ce!15199
2017-11-22 20:31:53 +00:00
Clement Ho 5083e0cf70 Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master'
Fix reply quote keyboard shortcut on MRs

Closes #40295

See merge request gitlab-org/gitlab-ce!15523
2017-11-22 17:11:25 +00:00
Travis Miller 1760e377d8 Add edit button to mobile file view 2017-11-22 10:52:34 -06:00
Sean McGivern e548c61334 Merge branch '39720-group-milestone-sorting' into 'master'
Add Group Milestone sorting

Closes #39720

See merge request gitlab-org/gitlab-ce!15230
2017-11-22 11:40:52 +00:00
Phil Hughes d7527d73b1 Merge branch 'feature_add_mermaid' into 'master'
Add support of Mermaid

Closes #3711

See merge request gitlab-org/gitlab-ce!15107
2017-11-22 11:00:12 +00:00
Vitaliy @blackst0ne Klachkov 131e74d10d Add support of Mermaid 2017-11-22 14:12:04 +11:00
Eric Eastwood 59502122bd Fix reply quote keyboard shortcut on MRs
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40295
2017-11-21 14:27:16 -06:00
Phil Hughes 5ce2f847b1 Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'
Fix commits list 500 with multi-file editor new_repo cookie

Closes #39821

See merge request gitlab-org/gitlab-ce!15502
2017-11-21 08:49:35 +00:00
Eric Eastwood 2d980cb71c Fix commits list 500 with multi-file editor new_repo cookie
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39821

/<namespace>/<project>/commmits/master
2017-11-20 14:17:39 -06:00
Tiago Botelho 053a198846 Impersonation no longer gets stuck on password change. 2017-11-20 18:02:41 +01:00
Eric Eastwood f494dbc515 Async notification subscriptions in issue boards 2017-11-20 12:38:53 -02:00
Grzegorz Bizon 128cb03bc8 Merge branch 'rc/use-existing-url-helper' into 'master'
Replace ci_status_path with pipeline_path

See merge request gitlab-org/gitlab-ce!15369
2017-11-17 09:25:19 +00:00
Sean McGivern f3454b2e77 Merge branch 'bvl-subgroup-in-dropdowns' into 'master'
Include child projects a user can manage in namespace dropdowns

Closes #39987

See merge request gitlab-org/gitlab-ce!15294
2017-11-14 17:54:24 +00:00
Bob Van Landuyt 022d8420ec Include child projects a user can manage in namespace dropdowns
These dropdown options are used for creating and transfering projects.
2017-11-14 16:57:41 +01:00
Filipa Lacerda be4abe7719 Stops page reload when changing tabs or pages - uses API requests instead 2017-11-14 15:35:29 +00:00
Rémy Coutable 6ae4747673 Replace ci_status_path with pipeline_path
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-14 12:45:43 +01:00
Tim Zallmann 6fa53d297f Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'
Don't perform a JS request when deleting a membership.

Closes #39933 and #31720

See merge request gitlab-org/gitlab-ce!15344
2017-11-13 22:24:03 +00:00
haseeb d2d7bfa760 fix to allow integer label refernces 2017-11-13 14:30:22 +00:00
Sean McGivern 3d24c01a19 Merge branch '39335-add-time-spend-to-milestones' into 'master'
Add total time spent to milestones

Closes #39335

See merge request gitlab-org/gitlab-ce!15116
2017-11-13 11:25:51 +00:00
Bob Van Landuyt a591b1c3ac Don't perform a JS request when deleting a membership. 2017-11-13 09:42:49 +01:00
Tim Zallmann 111faddc50 Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master'
Clear filter on gl_dropdown open

Closes #39564

See merge request gitlab-org/gitlab-ce!15214
2017-11-12 07:32:26 +00:00
George Andrinopoulos 46cacbe5cf Add feature test to milestone 2017-11-11 16:47:39 +02:00
Sean McGivern 58dd9d73ab Merge branch 'cleanup-issues-schema' into 'master'
Clean up the schema of the table "issues"

Closes #31811

See merge request gitlab-org/gitlab-ce!15225
2017-11-10 11:26:32 +00:00
Yorick Peterse d825c9cb5d
Clean up schema of the "issues" table
This adds various foreign key constraints, indexes, missing NOT NULL
constraints, and changes some column types from timestamp to
timestamptz.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31811
2017-11-09 18:00:30 +01:00
Eric Eastwood 6cbf6c5203 Move clear search test to JS to reduce overkill
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/33661
2017-11-09 09:29:07 -06:00
George Andrinopoulos a4d71cba7e Add group milestone to feature spec and minor changes 2017-11-07 20:57:30 +02:00
Eric Eastwood 3940fa0dce Add feature spec for Ingress 2017-11-07 12:34:19 -06:00
Shinya Maeda 4fac95a64d Merge branch 'master' into 38464-k8s-apps 2017-11-08 01:46:53 +09:00
Tim Zallmann cc17527846 Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'
Fix commit pipeline showing wrong status

Closes #39878

See merge request gitlab-org/gitlab-ce!15238
2017-11-07 16:32:21 +00:00
Shinya Maeda 93fe65702b Add feature spec for app installation 2017-11-08 01:22:28 +09:00
Douwe Maan c8eb789b09 Merge branch 'fix/import-export-arguments' into 'master'
Fix arguments error on Import/Export fetch_ref method

Closes #39541

See merge request gitlab-org/gitlab-ce!15241
2017-11-07 15:58:30 +00:00
James Lopez 179b8178bd Fix arguments error on Import/Export fetch_ref method
Added unit test and updated integration spec to test for this as well.
2017-11-07 14:25:35 +01:00
Filipa Lacerda dc1e6b4362 Merge branch 'multi-file-editor-separate-commits-call' into 'master'
Multi-file editor fetch log data from a different endpoint

Closes #38360

See merge request gitlab-org/gitlab-ce!15132
2017-11-07 13:18:39 +00:00
Filipa Lacerda 091f6387e4
Fix commit pipeline showing wrong status 2017-11-07 11:38:23 +00:00
Grzegorz Bizon ce7e60f6d7 Merge branch '35616-move-gke-form-1st-iteration' into 'master'
First iteration of Move Kubernetes from service to Cluster page

See merge request gitlab-org/gitlab-ce!15061
2017-11-07 10:14:22 +00:00
Shinya Maeda 8d51a2f48a Fix spec 2017-11-07 16:41:49 +09:00
George Andrinopoulos f4ed780ef5 Add Group Milestone sorting 2017-11-07 06:37:46 +02:00
Filipa Lacerda df7eaa85cb Merge branch 'es-module-copy_as_gfm' into 'master'
Convert copy_as_gfm into ES module and move to behaviors

See merge request gitlab-org/gitlab-ce!14859
2017-11-06 22:55:30 +00:00
Kamil Trzcinski df333a9380 Merge remote-tracking branch 'origin/master' into 35616-move-gke-form-1st-iteration 2017-11-06 22:38:44 +01:00
Kamil Trzcinski 7599009c27 Merge remote-tracking branch 'origin/move-kubernetes-from-service-to-clusters-page-10-2-ver' into 35616-move-gke-form-1st-iteration 2017-11-06 22:38:35 +01:00
Grzegorz Bizon c71cf908cd Merge branch 'refactor-clusters' into 'master'
Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform

See merge request gitlab-org/gitlab-ce!14879
2017-11-06 21:21:27 +00:00
George Andrinopoulos 4c31455a6b Remove create MR button from issues when MRs are disabled 2017-11-06 14:33:37 +00:00
Luke "Jared" Bennett 8dc55ff35e
add feature spec to assert no linked filter inputs 2017-11-06 13:12:06 +00:00
Phil Hughes e2bcb3a46f
fixed specs 2017-11-06 10:52:03 +00:00
Shinya Maeda 6c712667ab Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-clusters-page-10-2-ver 2017-11-05 19:55:35 +09:00
Shinya Maeda b737282ac7 Merge branch 'master' into refactor-clusters 2017-11-05 19:36:12 +09:00
Mike Greiling cc00b289f9
fix flaky tests by removing unneeded clicks and focus actions 2017-11-03 15:26:17 -05:00
Mike Greiling 72157766a2
Merge branch 'master' into sh-headless-chrome-support
* master: (33 commits)
  Ignore SQL CACHE hits in Sherlock
  Fix SQL timings for the performance bar
  Find the LFS-objects for a fork within a the fork network
  Remove bottom-border from last responsive table row
  Add system hooks user_rename and group_rename
  Unlink a project from a fork network when it's source was deleted.
  Make sure the settings page renders when root of a fork is deleted
  Remove Peek's original keyboard shortcut (numpad 0, keycode 96)
  Add application setting to Auto DevOps docs
  Enable MergeableSelector in scss-lint (for !14567)
  Enable MergeableSelector in scss-lint (for !14055)
  Enable MergeableSelector in scss-lint (for !14062)
  Enable MergeableSelector in scss-lint (for !14398)
  Enable MergeableSelector in scss-lint (for !13480)
  Enable MergeableSelector in scss-lint (for !13473)
  Enable MergeableSelector in scss-lint (for !13600)
  Enable MergeableSelector in scss-lint
  Resolve ""To do" should be "Todos" on Todos list page"
  Avoid regenerating the ref path for the environment
  Remove white space at bottom of issue boards
  ...
2017-11-03 14:02:52 -05:00