Commit Graph
1975 Commits
Author SHA1 Message Date
Stan Hu 81e741af24 Merge pull request #9138 from liyakun/master
add "replace" and "upload" functionality
2015-09-14 17:57:41 -07:00
liyakun e2ece2bc35 Add "Replace" and "Upload" features
Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes
2015-09-15 02:12:56 +02:00
Dmitriy Zaporozhets b35d5a6a16 Merge branch 'public_profiles' into 'master'
Make all group public

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#

Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1247
2015-09-14 15:28:42 +00:00
Dmitriy Zaporozhets c0c314c6bf Merge branch 'forked-repo-creation-async' into 'master'
Import forked repositories asynchronously to prevent large repositories from timing out

Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former.

One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked.

* Closes #2388
* Closes #2400

See merge request !1231
2015-09-14 14:56:13 +00:00
Dmitriy Zaporozhets 4e1c6019c8 Allow access to group from root url 2015-09-14 11:16:54 +02:00
Dmitriy Zaporozhets 4c060074b7 Skip auth for group page but return auth for other group pages 2015-09-14 11:05:23 +02:00
Stan Hu 9995f0806b Import forked repositories asynchronously to prevent large repositories from timing out
Use import_status to track async import status and give feedback to the user

Closes #2388
Closes #2400
2015-09-11 00:34:04 -07:00
Douwe Maan a6997e339b Merge branch 'master' into dashboard-titles 2015-09-10 13:13:01 +01:00
Dmitriy Zaporozhets b05cc8bc9a Merge branch 'global_labels' into 'master'
Global labels

https://dev.gitlab.org/gitlab/gitlabhq/issues/2353

See merge request !1240
2015-09-09 08:57:54 +00:00
Douwe Maan be59f4338f Fix RootController 2015-09-09 09:25:49 +01:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Douwe Maan 1489d225d6 Move partial to right place and fix tests. 2015-09-08 15:14:14 +01:00
Douwe Maan 5d785457db Clean up overlap between dashboard and explore.
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
2015-09-08 14:49:20 +01:00
Douwe Maan c258e97747 Make Help accessible for guests. 2015-09-08 14:42:30 +01:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master'
Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228
2015-09-07 11:20:03 +00:00
Douwe Maan 662cf2cef4 Merge branch 'fix-wiki-page-history' into 'master'
Fix broken Wiki Page History

This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.

Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399

See merge request !1232
2015-09-07 09:27:48 +00:00
pilsner 4144c59941 add Content-Type header of raw image file
Add Content-Type header to fix a bug which IE can't show image in
markdown when the image is from raw.

	modified:   CHANGELOG
	modified:   app/controllers/projects/raw_controller.rb
	modified:   spec/controllers/projects/raw_controller_spec.rb
2015-09-04 13:06:02 +09:00
Valery Sizov 6bd3d72bbd added spinach for glabal labels 2015-09-03 19:02:14 +03:00
Valery Sizov 57d0013090 CRUD for admin labels 2015-09-03 15:50:23 +03:00
Dmitriy Zaporozhets 5bbe6c4d54 Split starred projects list and activity in same way like we did with your projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 19:17:04 +02:00
Dmitriy Zaporozhets 28219ea921 Merge branch 'fix-raw-controller-disposition' into 'master'
Remove the filename argument from Content-Disposition header

This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL.

For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/fdb688282c0d4564872deadb44c58b2c/image.png)

If you look at the `Content-Disposition` field, you see this:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2b342b83ae1ec61fd31937163ace8ec5/image.png)

Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard.

See: http://greenbytes.de/tech/tc2231/

Closes https://github.com/gitlabhq/gitlabhq/issues/9595

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

I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461

See merge request !1235
2015-09-02 12:25:28 +00:00
Valery Sizov 3700e5a960 Crowd integration 2015-09-02 12:42:01 +03:00
Stan Hu 551157960e Remove the filename argument from Content-Disposition header to avoid
RFC 5987 and RFC 6266 encoding issues. This change allows the browser
to determine the filename based on the URL.

See: http://greenbytes.de/tech/tc2231/

Closes https://github.com/gitlabhq/gitlabhq/issues/9595

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
2015-09-02 00:20:05 -07:00
Stan Hu fbb891c8f3 Fix broken Wiki Page History
Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-01 23:29:27 -07:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03:00
Dmitriy Zaporozhets 53698401fb Merge branch 'make_all_profile_public' into 'master'
Make all profile public

https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1219
2015-08-27 21:55:00 +00:00
Douwe Maan 30555c1d24 Merge branch 'rs-remove-user-color-scheme-class' into 'master'
Apply syntax highlighting to fenced code blocks client-side

Instead of applying the syntax highlighting scheme class to these blocks
server-side, we use Javascript and Gon to apply the user's color scheme
(or the default) client-side.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.

See merge request !1203
2015-08-27 16:24:51 +00:00
Valery Sizov ff30b40754 Make all profile public 2015-08-27 13:06:14 +03:00
Dmitriy Zaporozhets 8cc47bbf3c Merge branch 'ui-improvements' into 'master'
UI improvements

* use shared partials for repeating rendering of projects, groups, snippets etc
* more consistency in way how projects, snippets and groups lists are rendered
* fix 500 error when submit project snippet without body
* remove some old and unused css
* more compact search page

See merge request !1214
2015-08-27 08:09:53 +00:00
Dmitriy Zaporozhets daa90e1182 Fix 500 error when try to create project snippet without content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 23:59:52 +02:00
Dmitriy Zaporozhets ef0149dd44 Merge branch 'enable_ssl_verification_web_hook' into 'master'
Enable SSL verification for Webhooks

https://dev.gitlab.org/gitlab/gitlabhq/issues/2121

See merge request !1135
2015-08-26 16:06:02 +00:00
Stan Hu c1fe98e0b9 Prevent too many redirects error when home page URL set to external_urll
Many users naively set the home page URL setting to external_url
(e.g. https://mydomain.com). When an unauthenticated user signs in, this
causes endless redirections. For example, this is occuring:

1. Unauthenticated user attempts to access https://mydomain.com/dashboard
2. Application redirects to the home page URL: https://mydomain.com
3. Repeat step 2

In step 3, ApplicationController should have redirected the user to
https://mydomain.com/users/sign_in. Disabling the redirection if home
page URL is the same as external_url prevents users from messing up.

Closes https://github.com/gitlabhq/gitlabhq/issues/8843
Closes #2057
2015-08-26 07:38:33 -07:00
Valery Sizov bafffb2d14 Enable SSL verification for Webhooks 2015-08-26 15:48:31 +03:00
Robert Speicher 2c3e42e4a4 Remove user_color_scheme_class
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
2015-08-25 15:32:38 -07:00
Dmitriy Zaporozhets a0284b5b85 Merge branch 'separate-activity' into 'master'
Separate activity page

Move activity to separate page.

Part of #2225

![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png)

See merge request !1198
2015-08-25 16:19:12 +00:00
Dmitriy Zaporozhets 8f68c38746 Dashboard activity as separate page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-25 14:13:04 +02:00
Dmitriy Zaporozhets e02b7bf443 Improve abuse reports management
* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report with page reloading

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-25 10:52:10 +02:00
Valery Sizov 56527b63e8 Ability to search milestones 2015-08-24 13:59:01 +03:00
Stan Hu ed1d4fa477 Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
and request them each session. Pass these tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871
2015-08-23 09:23:44 -07:00
Douwe Maan 0daa21ed8c Merge branch 'fix-email-autocomplete' into 'master'
Fix bug preventing invite by e-mail

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320

See merge request !1181
2015-08-21 22:25:59 +00:00
Stan Hu 3715a0f29b Fix bug preventing invite by e-mail
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320
2015-08-21 13:47:56 -07:00
Douwe Maan 2de0935e27 Merge branch 'fix-blame-lines-grouping' into 'master'
Fix blame view line groupings

Before:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b84f75183244e58683b9172c772591d6/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12ef635deefd3616142e65f064252020/image.png)

Closes #2305

See merge request !1176
2015-08-20 21:24:48 +00:00
Artem Sidorenko e238a8dad5 Import sources: show only enabled sources 2015-08-20 12:13:22 +02:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Stan Hu 0a5b005da1 Fix blame view line groupings
Closes #2305
2015-08-20 01:27:29 -07:00
Artem Sidorenko 3ebbed25f0 Allow listing of archived projects
Resolves #9285
2015-08-19 13:46:59 +02:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
Robert Speicher a42c548a8d Use File.join instead of Rails.root.join in HelpController 2015-08-18 09:08:03 -07:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00