root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
73,434 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

249 Commits

Author SHA1 Message Date
Takuya Noguchi 21e6c7acf2 Refactor CSS to eliminate vertical misalignment of login nav 2018-04-11 23:52:47 +09:00
Francisco Javier López 31dd86b636 Projects and groups badges settings UI 2018-04-08 10:20:05 +00:00
Rémy Coutable 160d29b869 Merge branch '44752-remove-ee-specific-comments' into 'master' 
Remove EE-specific comment markers from CE

Closes #44752

See merge request gitlab-org/gitlab-ce!18054
 2018-03-28 18:12:20 +00:00
Eric Eastwood d5f0d89f9d Remove EE-specific comments from CE 2018-03-28 11:05:14 -05:00
bitsapien a30358881c [FIX] Fixed bug in dropdown selector when selecting the same selection again 2018-03-27 18:51:11 +00:00
Mike Greiling 57d1ddff0e
replace fixture with simple mount point 2018-03-06 11:09:16 -06:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Kamil Trzciński a55cfc1e63 Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master' 
Dynamic CI secret variables -- CE backport

See merge request gitlab-org/gitlab-ce!16842
 2018-02-07 12:23:36 +00:00
Shinya Maeda bbeb274a25 Refactor :trace to :trace_live in spec 2018-02-06 15:50:08 +09:00
Eric Eastwood 3be32027b6 Use dynamic variable list in scheduled pipelines and group/project CI secret variables 
See https://gitlab.com/gitlab-org/gitlab-ce/issues/39118

Conflicts:
	app/views/ci/variables/_form.html.haml
	app/views/ci/variables/_table.html.haml
	ee/app/views/ci/variables/_environment_scope.html.haml
	spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js
	spec/javascripts/fixtures/projects.rb
 2018-02-05 13:09:29 -06:00
Eric Eastwood 332aa756d2 Refactor CI variable list code for usage with CI/CD settings page secret variables 
Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
 2018-01-31 13:18:32 -06:00
Eric Eastwood 737236551f Generalize toggle_buttons.js 
Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
 2018-01-26 12:46:38 -06:00
Achilleas Pipinellis 85940d766a
Default to HTTPS for all Gravatar URLs 
If using gravatar.com, both plain_url and ssl_url in settings are now
served via HTTPS. Make this the default.
 2018-01-25 10:00:46 +01:00
Phil Hughes dd633dc48f Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master' 
Fix duplicate item in protected branch/tag dropdowns

Closes #42157 and #41989

See merge request gitlab-org/gitlab-ce!16540
 2018-01-19 09:23:18 +00:00
Eric Eastwood ea04d1ab3a Fix duplicate item in protected branch/tag dropdown 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/42157
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41989
 2018-01-18 23:04:50 -06:00
Winnie Hellmann be8c4af83a Filter groups and projects dropdowns of search page on backend 2018-01-17 23:32:42 +00:00
Matija Čupić e17f0e9e34
Add reset cache button to pipelines view 2017-12-21 02:30:03 +01:00
Filipa Lacerda 074fcb56bb
Adds JS unit tests 
Finishes tabs & table
Updates e2e tests
 2017-11-27 17:28:33 +00:00
Filipa Lacerda 1b40a9f803
Handle toggle button with API request 
Add tests
Update empty state
[ci skip]
 2017-11-24 21:08:15 +00:00
Filipa Lacerda 4563156256 Improve environments performance 2017-11-23 12:04:03 +00:00
Filipa Lacerda be4abe7719 Stops page reload when changing tabs or pages - uses API requests instead 2017-11-14 15:35:29 +00:00
Clement Ho b22f4d2aad Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master' 
Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled

Closes #20666

See merge request gitlab-org/gitlab-ce!15021
 2017-11-06 22:39:07 +00:00
Jacopo d4a9aedf55 Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled 
The dropdown options `Issues assigned to me` and `Issues I've created` in project search are now
hidden when issues are disabled on the project.
 2017-11-06 21:30:18 +01:00
Shinya Maeda 600d5f4fba Fix tests. Remove NOT NULL constraint from cluster.user. 2017-11-03 17:22:49 +09:00
Filipa Lacerda f4c10492f4
Fix sidebar title 
Fix fixture
 2017-10-06 12:16:08 +01:00
Shinya Maeda 88cc9d5294 Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service 2017-10-05 14:49:16 +09:00
Kamil Trzcinski bee5c08094 Fix Rubocop failures 2017-10-04 21:13:01 +02:00
Filipa Lacerda 2e53056e94 Adds Frontend specs 2017-10-04 16:45:02 +01:00
Jacopo e050313049 Hide close MR button after merge without reloading page 
After merging a MR the close button is hidden, without reloading the page.
 2017-09-24 12:42:29 +02:00
Tim Zallmann 55f772bb98 Resolve "Better SVG Usage in the Frontend" 2017-09-22 08:39:47 +00:00
Tim Zallmann eebd99b2fc Deleted another Fixture due to User Callout 2017-09-20 20:00:32 +02:00
Tim Zallmann 2e08a13fff Fixture Creation removed 2017-09-20 20:00:32 +02:00
Jose Ivan Vargas b623807682 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2017-09-03 16:09:59 -05:00
Gabriel Mazetto a882026bdf Cleaning up repositories for javascript fixture specs to work correctly 
We need to cleanup after each execution so we can still re-use the same
paths and prevent collision with the on disk validation
 2017-08-30 20:22:48 +02:00
Douwe Maan fbe82e4cd9 Merge branch 'master' into issue-discussions-refactor 
# Conflicts:
#	package.json
 2017-08-23 11:31:17 +02:00
Bryce Johnson 4add91b6e1 Use non-i18n values for setting new group-level issue/MR button text 2017-08-21 21:29:09 +00:00
Douwe Maan 834f1b30d5 Merge branch 'master' into issue-discussions-refactor 
# Conflicts:
#	package.json
#	spec/support/features/reportable_note_shared_examples.rb
 2017-08-17 14:01:31 +02:00
Robert Speicher 142b9ec4a0 Fix two additional violations caused by previous changes 2017-08-15 15:53:16 -04:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Filipa Lacerda e93214bce6 Merge branch 'master' into issue-discussions-refactor 
* master: (66 commits)
  fix confidential border issue as well as confidential styles leaking on new MR
  Migrate force push check to Gitaly
  Add option to disable project export on instance
  Better categorize test coverage results
  Add option to disable project export on instance - db changes
  Better caching and indexing of broadcast messages
  Include the `is_admin` field in the `GET /users/:id` API when current user is an admin
  Document rspec-retry and rspec-flaky
  Fix cop description
  Retrieve and sync flaky specs report from and to S3
  Use a new RspecFlakyListener to detect flaky specs
  Fix formatting of patch_versions.md [skip ci]
  Enable Timecop safe mode
  Show error message for API 500 error in tests, and
  Fix merge request diff deserialisation when too_large was absent
  Delete correct key from `session` after authenticating using U2F
  Bumps omniauth-ldap gem version to 2.0.4
  Pending delete projects no longer return 500 error in Admins projects view
  Do not run the `ee_compat_check` job for stableish branches
  Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
  ...
 2017-08-12 00:17:48 +01:00
Robert Speicher c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Filipa Lacerda d323bb79eb Change fixtures of old tests 2017-08-10 16:48:22 +01:00
winh d1500e898b Restore blob fixture for JavaScript tests 2017-08-08 23:25:01 +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
Bryce Johnson 0532bff6d4 Group-level new issue & MR using previously selected project 2017-08-07 20:55:50 +00:00
Douwe Maan 2197ee02e9 Merge branch 'master' into ide 2017-08-03 13:13:06 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04:00
Luke "Jared" Bennett dc04fdc1a3
Merge remote-tracking branch 'origin/master' into ide 2017-07-28 15:26:00 +01:00
Luke "Jared" Bennett 6448368b5b
Merge remote-tracking branch 'origin/master' into ide 2017-07-20 17:51:07 +01:00