home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,383 Commits 48 Branches 340 Tags
4bed25b1e1a8a66cc151dfcf5600a68b8d6c407e
Commit Graph
8785 Commits
Author SHA1 Message Date
Douwe Maan 844cca4a1e Add Git hook to validate maximum file size. 2015-06-09 10:23:38 +02:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00
Dmitriy Zaporozhets 354b6f1cd3 Remove line under project description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 19:50:23 +02:00
Dmitriy Zaporozhets 2d5165979f Fix css alignment in header. Use scss variable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 18:49:00 +02:00
Dmitriy Zaporozhets 87f9c475db Merge branch 'refactor-web-editor' into 'master' 
Refactor web editor

* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #1761

See merge request !773
 2015-06-05 16:14:34 +00:00
Dmitriy Zaporozhets 5a026152b7 Merge branch 'warn-about-referenced-users' into 'master' 
Show warning when a comment will add 10 or more people to the discussion.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054

New issue:

![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png)

New comment:

![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png)

See merge request !754
 2015-06-05 13:37:08 +00:00
Dmitriy Zaporozhets 6f7bf4e4f0 Merge branch 'wip-mr-docs' into 'master' 
Add info about WIP merge requests to docs.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078.

See merge request !770
 2015-06-05 13:35:16 +00:00
Dmitriy Zaporozhets dfccb06dda Refactor web editor 
* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:01:38 +02:00
Douwe Maan 9a50db693a Fix timeout when rendering file with thousands of lines. 2015-06-05 13:56:37 +02:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00
Douwe Maan 5256b5cc06 Prefer jQuery on to bind, and don't use .js class. 2015-06-05 12:13:02 +02:00
Dmitriy Zaporozhets 8d2996fe0e Fix empty header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 12:08:43 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Dmitriy Zaporozhets b9219469f7 Merge branch 'make-namespaces-api-available-to-all-users' into 'master' 
Make namespace API available to all users

### What does this MR do?

This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API.

### Why was this MR needed?

Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects.

### What are the relevant issue numbers?

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

See merge request !708
 2015-06-04 15:59:17 +00:00
Dmitriy Zaporozhets 1d945945bb Merge branch 'sn-push-email-plussign' into 'master' 
Use entity number for plus sign in push emails

Was doing some testing today and found that both outlook and gmail had issues displaying the html content produced for push emails when a file was added.

This is how gmail shows it:
![Gmail_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/24be115dbae97997bc02e2ec70d9870c/Gmail_name.png)

And this is for Outlook:
![Outlook_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/4b5a54956139d36d78f9c61c83e99928/Outlook_name.png)

iOS devices work with the &plus; entity, as does Mail on OS X, but I'm wondering if it is only available for newer html parsers (a quick browse on the w3c site seems to show that it was added in html 5).

Changing the entity to `&#43;` and both gmail and outlook and iOS and Mail.

See merge request !721
 2015-06-04 15:57:53 +00:00
Dmitriy Zaporozhets ef3e0931b9 Merge branch 'fix-no-labels-page' into 'master' 
Omit link to generate labels if user does not have access to create them

On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label.

Screenshot:

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

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

See merge request !752
 2015-06-04 15:56:13 +00:00
Robert Speicher 793d9799b6 Show key fingerprint on DeployKeys#index 
Also style all key fingerprints consistently across the app.
 2015-06-03 18:03:04 -04:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Dmitriy Zaporozhets fb59f04fdf Merge branch 'fix-group-remove' into 'master' 
Group improvements

* remove projects before removing group
* execute all hooks/events from project destroy when group removed
* log group create/remove
* delay remove of namespace directory (to prevent NFS issues)

Inspired by !759

See merge request !761
 2015-06-03 15:02:33 +00:00
Dmitriy Zaporozhets e414463d9e Merge branch 'repo-remove' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2015-06-03 16:17:36 +02:00
Dmitriy Zaporozhets 53a0ac4734 Skip repo removing whem remove user or group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 16:16:27 +02:00
Dmitriy Zaporozhets 47a95754de Log group creation and removal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 16:15:58 +02:00
Dmitriy Zaporozhets 7bab4817f7 Merge branch 'repo-remove' into fix-group-remove 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2015-06-03 15:15:46 +02:00
Dmitriy Zaporozhets 58ab8a4a9d Fix tests and increase delay time before remove repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 15:09:12 +02:00
Dmitriy Zaporozhets 1edff53444 Remove projects before group/user. Remove namespace directory async 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 14:57:12 +02:00
Dmitriy Zaporozhets 61cfd1d273 Wrap group removal into service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 14:07:20 +02:00
Douwe Maan 69630394cf Merge branch 'add-resend-confirmation-email-in-profile' into 'master' 
Add "Resend confirmation e-mail" link in profile settings

Adds a convenience link to resend the confirmation e-mail if necessary. Before, user had to logout or open an Incognito Window to do this.

Screenshot:

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

Fixes https://github.com/gitlabhq/gitlabhq/issues/9274

See merge request !634
 2015-06-03 11:47:45 +00:00
Dmitriy Zaporozhets 97ff86e07c Move repository when project is removed 
Ths commit does next:

* When we remove project we move repository to path+deleted.git
* Then we schedule removal of path+deleted with sidekiq
* If repository move failed we abort project removal

This should help us with NFS issue when project get removed but
repository stayed. The full explanation of problem is below:

* rm -rf project.git
* rm -rf removes project.git/objects/foo
* NFS server renames foo to foo.nfsXXXX because some NFS client (think
* Unicorn) still has the file open
* rm -rf exits, but project.git/objects/foo.nfsXXX still exists
* Unicorn closes the file, the NFS client closes the file (foo), and the
* NFS server removes foo.nfsXXX
* the directory project.git/objects/ still exists => problem

So now we move repository and even if repository removal failed

Repository directory is moved so no bugs with project removed but
repository directory taken. User still able to create new project with
same name. From administrator perspective you can easily find stalled
repositories by searching `*+deleted.git`

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 13:05:43 +02:00
Dmitriy Zaporozhets 41d4aaa4be Merge branch 'rs-more-js-testing' into 'master' 
More Javascript testing

Continuation of !715

See merge request !736
 2015-06-03 08:13:50 +00:00
Dmitriy Zaporozhets 8631b6a258 Merge branch 'rs-issue-1022' into 'master' 
Push event: Nest link in strong tag, not vice-versa

Closes #1022

See merge request !755
 2015-06-03 08:12:43 +00:00
Stan Hu a38dd9bd3a Add "Resend confirmation e-mail" link in profile settings 
Fixes https://github.com/gitlabhq/gitlabhq/issues/9274
 2015-06-03 00:12:43 -07:00
Robert Speicher 29626b0885 Remove unused showAndHide, simpleFormat, and linkify functions 
Also removes redundant `unbind` call
 2015-06-02 20:32:07 -04:00
Robert Speicher 4560954404 Move jQuery enable/disable extensions to extensions/jquery 
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
 2015-06-02 20:32:07 -04:00
Robert Speicher f76a3f3db7 Add ZenMode javascript specs 2015-06-02 20:32:07 -04:00
Robert Speicher e860dedd1c Push event: Nest link in strong tag, not vice-versa 
Closes #1022
 2015-06-02 15:05:44 -04:00
Dmitriy Zaporozhets 79aac2c128 Merge branch 'ignore-references' into 'master' 
Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753
 2015-06-02 18:39:18 +00:00
Robert Speicher 023dd2907b Add a pipeline context option for SanitizationFilter 
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
 2015-06-02 13:04:10 -04:00
Robert Speicher 1a52f19c45 Remove now-unused escaped_autolink helper and rails_autolink gem 2015-06-02 13:04:10 -04:00
Robert Speicher 2a5c963b7c Render Group and Project descriptions with our Markdown pipeline 2015-06-02 13:04:10 -04:00
Valery Sizov b931c11e1b GitLab CI service sends gitlab-ci.yml file 2015-06-02 16:46:01 +03:00
Dmitriy Zaporozhets 1c328fa4d7 Improve hover color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 13:20:09 +02:00
Douwe Maan fe78984f20 Actually ignore references in code blocks etc. 2015-06-02 13:17:11 +02:00
Dmitriy Zaporozhets 5a1aa49b55 Merge branch 'web-editor-rugged' into 'master' 
Create and edit files in web editor via rugged

- [x] create file via rugged
- [x] update file via rugged
- [x] remove file via rugged
- [ ] fix tests
- [x] remove satellites code
- [x] create activity event for new/edit file via rugged
- [x] base64 support

Part of https://dev.gitlab.org/gitlab/gitlabhq/issues/2300

See merge request !751
 2015-06-02 10:41:36 +00:00
Dmitriy Zaporozhets 435f680b89 Make web editor work correctly after switch from satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 12:06:40 +02:00
Dmitriy Zaporozhets 8997812626 Remove files in web editor using rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 11:41:21 +02:00
Douwe Maan a675bea2c1 Merge branch 'rs-issue-1721' into 'master' 
Fix link_to_gfm with only a reference having the incorrect link

Before:

```ruby
link_to_gfm("#4", "/foo")     # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```

After:

```ruby
link_to_gfm("#4", "/foo")     # => "<a href="/foo">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```

Closes #192
Closes #1721
Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115)

See merge request !739
 2015-06-02 08:56:53 +00:00
Douwe Maan d99637bf69 Merge branch 'feature/sso_integration' into 'master' 
Add an option to automatically sign-in with an Omniauth provider

Split of !669 as requested

This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.

See merge request !723
 2015-06-02 08:50:54 +00:00
Dmitriy Zaporozhets 3d416f1682 Create activity event and execute hooks on web editor commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 10:45:13 +02:00
Stan Hu cf7707b4fe Omit link to generate labels if user does not have access to create them 
Closes https://github.com/gitlabhq/gitlabhq/issues/8353
 2015-06-01 22:42:53 -07:00