Commit Graph
27818 Commits
Author SHA1 Message Date
James Lopez c422cef02f Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-05 09:53:18 +02:00
James Lopez c1858da9e1 remove spec helper conf 2016-05-05 09:35:27 +02:00
James Lopez 48fcf54040 add gitlab project controller - still WIP 2016-05-04 18:01:41 +02:00
James Lopez 7a531bb116 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-04 17:44:15 +02:00
James Lopez a4d242b887 refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR 2016-05-04 17:42:02 +02:00
James Lopez 84c7b5185d Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-04 15:14:43 +02:00
James Lopez 773c39cca3 fixed import export reader spec 2016-05-04 15:13:44 +02:00
James Lopez 14dd2d4ad0 fixed import file spec 2016-05-04 15:05:28 +02:00
James Lopez e5ee7e8692 typos in export page 2016-05-04 11:10:25 +02:00
James Lopez 6cf88ce480 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-04 11:05:21 +02:00
James Lopez 1ff7735906 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-04 11:02:44 +02:00
James Lopez 9b21207305 updated import worker 2016-05-04 11:01:55 +02:00
James Lopez bc8eebf04a add export worker to process project export async 2016-05-04 10:59:33 +02:00
James Lopez bd2ebf37e6 use worker in controller 2016-05-04 10:57:09 +02:00
James Lopez 17cfce7adc typo 2016-05-03 15:09:28 +02:00
James Lopez b69c8c280c fixing some export issues in spec 2016-05-03 15:07:05 +02:00
James Lopez fc329696e2 typo 2016-05-03 13:40:49 +02:00
James Lopez 315195fe56 fix schema file 2016-05-03 13:18:39 +02:00
James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb
2016-05-03 13:14:31 +02:00
James Lopez e172028a36 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-03 13:07:16 +02:00
James Lopez 1990616a21 fixed warning 2016-05-03 13:06:00 +02:00
James Lopez 6139e1433c fixing some rubucop warnings 2016-05-03 12:46:00 +02:00
James Lopez 9d306eb132 picking stuff from ui related to import 2016-05-03 12:41:23 +02:00
James Lopez 548c91e3c5 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
#	lib/gitlab/import_export/command_line_util.rb
2016-05-03 11:34:13 +02:00
James Lopez 2a78e03ad5 Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-05-03 11:15:38 +02:00
James Lopez 58b0b1a661 picking export stuff from the UI branch 2016-05-03 11:13:10 +02:00
Robert Speicher f0c4f72735 Update CHANGELOG for 8.6.8, 8.5.12, et al.
[ci skip]
2016-05-02 21:47:11 -04:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Robert Speicher 2c468ebd2c Merge branch 'support-notifications-on-project-snippets' into 'master'
Support e-mail notifications for comments on project snippets

While working with project snippets recently, I noticed that notifications would not be sent out for comments on notes. This MR fixes this.

Note: I'm not completely sure why `ProjectSnippets#participants` returns an empty array if you don't include the concern that is already in `Snippets` but didn't dig into it any more.

Closes #2334

See merge request !3987
2016-05-02 20:07:28 +00:00
Stan Hu f64b82e1da Support e-mail notifications for comments on project snippets
Closes #2334
2016-05-02 11:01:32 -07:00
Robert Speicher 0652d92526 Merge branch '15527-fix-wiki-page-creation-issue' into 'master'
Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924
2016-05-02 17:18:22 +00:00
Robert Speicher 819076efe1 Merge branch 'improve-session-expiry' into 'master'
Fix "remember me" sign in option

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4006

Prior to this change, 'remember me' was effectively always on because
the `_gitlab_session` cookie was always made persistent. With this
change it becomes possible again to have `_gitlab_session`be a session
cookie when 'remember me' is unchecked.

See merge request !4004
2016-05-02 16:52:22 +00:00
Rémy Coutable f1e74de47c Simplify specs by not over-expecting
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-02 18:34:14 +02:00
James Lopez 5a4f576359 fixing issues with project members mapping. Also added some more JS magic to the import page 2016-05-02 18:22:18 +02:00
Robert Speicher f47e1e8892 Merge branch 'fix-changelog' into 'master'
Remove duplicate entry in the CHANGELOG

[ci skip]

See merge request !4002
2016-05-02 15:26:25 +00:00
Jacob Vosmaer dc0ff9a174 Fix "remember me" sign in option 2016-05-02 17:22:03 +02:00
Robert Speicher ec2710d0f5 Merge branch 'feature/backport-safewebhooks' into 'master'
Backported minimal safewebhook implementation to GitLab CE

This brings a minimal implementation for gitlab-org/gitlab-ce#13478
backported from EE (gitlab-org/gitlab-ee!334).

Also added UI to configure Secret Token

Fixes #15365.

See merge request !3940
2016-05-02 15:13:42 +00:00
Dmitriy Zaporozhets 1dfd051ec5 Remove duplicate entry in the CHANGELOG 2016-05-02 14:32:26 +00:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook
Codestyle changes to easy EE merge
2016-05-02 10:32:01 -03:00
James Lopez b5f2a7e139 fixed integration test 2016-05-02 11:58:35 +02:00
James Lopez 07ab6c2e26 refactoring and fixing a bunch of stuff 2016-05-02 11:29:21 +02:00
Achilleas Pipinellis 15a2c55802 Merge branch 'fix-github-oauth-instructions' into 'master'
Fix the GitHub Omniauth instructions

Technically the screenshot is also out of date, but I honestly don't care enough to go through the effort of making a sample application, taking a screenshot, etc.

See merge request !3976
2016-05-01 17:40:41 +00:00
Robert Speicher 6a56cff686 Merge branch 'fix/handle-issue-move-access' into 'master'
Handle issue move access instead of raising error

Closes #15533

See merge request !3990
2016-04-30 20:15:54 +00:00
Grzegorz Bizon c9577711ce Handle issue move access instead of raising error
Closes #15533
2016-04-30 21:28:40 +02:00
Gabriel Mazetto 0cd5edf35c Backported minimal safewebhook implementation to GitLab CE 2016-04-30 05:04:10 -03:00
Robert Speicher 40c38644a8 Merge branch 'add-parameters' into 'master'
Add more parameters to the filter_parameters config.

Adds Sentry DSN, Webhooks, Deploy Keys, etc.

Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.

This also seems to be the more popular syntax for adding new parameters, from what I can find.

In the future we may want to [increase the specificity of some of these](http://blog.bigbinary.com/2016/03/07/parameter-filtering-enhacement-rails-5.html) once Rails 5 is out. e.g. instead of `:hook`, `"hook.url"` would be just as effective without removing potentially useful information from the logs.

cc: @stanhu 

See merge request !3971
2016-04-30 01:48:05 +00:00
Connor Shea 8d3debe4cc Add more parameters to the filter_parameters config.
Adds Sentry DSN, Webhooks, Deploy Keys, etc.

Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.

This also seems to be the more popular syntax for adding new parameters, from what I can find.
2016-04-29 18:44:49 -06:00
Robert Speicher 11773f3fc9 Merge branch 'check-protected-branches' into 'master'
Cleaned up/tweaked Project#open_branches

See commit c825404572040a3a45cb9e2b3d3e7d64900f66c9 for the details of the changes and https://gitlab.com/gitlab-org/gitlab-ce/issues/14280#note_4973648 for more information.

See merge request !3985
2016-04-29 21:45:15 +00:00
Yorick Peterse b6a18f1093 Tweak checking branches in Project#open_branches
This changes 4 things:

1. Project#protected_branches_names has been renamed to
   Project#protected_branch_names.

2. Project#open_branches uses a Set for the branch names as checking
   values in a Set is faster than checking values in a (large) Array.

3. Some redundant code in Project#open_branches has been removed.

4. Project#protected_branch_names now uses #pluck instead of #map,
   removing the need for loading entire DB records into memory.
2016-04-29 22:44:08 +02:00
Drew Blessing 65e845bad9 Merge branch 'fix-docs-links' into 'master'
Fix some broken links in the documentation [ci skip]

cc: @dblessing @axil 

See merge request !3982
2016-04-29 20:22:47 +00:00