home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,528 Commits 48 Branches 340 Tags
f552153ee63293dbb4cc0765e806cf3aee5b1fe3
Commit Graph
2107 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
 2015-06-12 11:16:28 +02:00
Dmitriy Zaporozhets 21a62bb995 Merge branch 'refactor-mr-widget' into 'master' 
Refactor accept merge request widget

* make each case a simple view
* separate  merge request JS from merge request accept widget JS

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

See merge request !799
 2015-06-12 08:22:13 +00:00
Dmitriy Zaporozhets c69ca9912e Merge pull request #9371 from zenati/patch-2 
An `in_namespace` scope is already present
 2015-06-11 23:09:41 +02:00
Dmitriy Zaporozhets 946b4ceda3 Improve variables in mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 18:45:12 +02:00
Dmitriy Zaporozhets 644b6ba993 Refactor accept merge request widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 09:40:26 +02:00
Dmitriy Zaporozhets 747f66559e Merge branch 'mr-approves' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-06-10 16:51:07 +02:00
Robert Speicher 94cbf0091f Fix taskable require 2015-06-10 01:38:45 -04:00
Robert Speicher 33df3ed384 Add respond_to_missing? for Commit and Repository 
As of Ruby 1.9, this is the correct way to handle `respond_to?` for
methods implemented by `method_missing`.

See https://robots.thoughtbot.com/always-define-respond-to-missing-when-overriding
 2015-06-10 01:31:27 -04:00
Dmitriy Zaporozhets efdf3d2905 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/README.md
	doc/workflow/README.md
 2015-06-09 19:24:37 +02:00
Dmitriy Zaporozhets 8c830688aa Add ability to change amount of required approvals in project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 17:14:25 +02:00
Dmitriy Zaporozhets 5c0bfc173a Approve widget with users who approved 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 16:50:09 +02:00
Dmitriy Zaporozhets a2726dc346 Check for accept mr button in approval test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 16:49:36 +02:00
Dmitriy Zaporozhets 73faf3c728 Rename approve->approval. Add approval count to project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 15:57:34 +02:00
Dmitriy Zaporozhets 99ae2c0230 Explicitly say approve class name in association 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 14:42:11 +02:00
zenati b0de6e9ae2 An in_namespace scope is already present 2015-06-09 13:42:01 +02:00
Dmitriy Zaporozhets 7ba4e05ffa Create Approve model for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 13:38:47 +02:00
Douwe Maan 844cca4a1e Add Git hook to validate maximum file size. 2015-06-09 10:23:38 +02:00
Robert Speicher 23954b0f77 Correctly remove already-mentioned commits for cross references 
Fixes #1778
 2015-06-08 18:13:14 -04: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 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 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
Valery Sizov b931c11e1b GitLab CI service sends gitlab-ci.yml file 2015-06-02 16:46:01 +03: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
Dmitriy Zaporozhets 734a4ba87d Create and edit files in web editor via rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 20:49:11 +02:00
Alex Lossent 60225a067d Allow to configure a URL to show after sign out 2015-05-29 18:20:15 +02:00
Dmitriy Zaporozhets a1c45338f3 Merge branch 'support-edit-target-branch-in-mr' into 'master' 
Support editing target branch of merge request

### What does this MR do?

This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens.

### Why was this MR needed?

Because lots of people requested this feature. :)

### Screenshots

**Edit MR page**

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

**New MR page**

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

**System note**

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

### What are the relevant issue numbers?

* Closes https://github.com/gitlabhq/gitlabhq/issues/7105
* See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130!

See merge request !738
 2015-05-29 15:01:54 +00:00
Douwe Maan 96d6fdc27c Add option to disallow users from registering any application to use GitLab as an OAuth provider 2015-05-29 13:29:16 +02:00
Stan Hu 5e4384ec9b Support editing target branch of merge request 
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
 2015-05-29 04:08:08 -07:00
Dmitriy Zaporozhets d047d299bf Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio 
Allow special characters in users bio
 2015-05-29 10:41:01 +02:00
Stan Hu 67992b9be6 Make namespace API available to all users 
Closes https://github.com/gitlabhq/gitlabhq/issues/9328
 2015-05-28 11:39:12 -07:00
Dmitriy Zaporozhets 499154518a You can not remove user if he/she is an only owner of group 
To prevent loose of group data you need to transfer or remove group
first before you can remove user

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 12:00:02 +02:00
Jeroen van Baarsen 3865a1d925 Allow special characters in users bio 
**What does this do?**
It removes the very strict sanitation on the users bio field, so that people can
have a bio like "I <3 GitLab"

**Why is this needed?**
Currently when you enter a bio with "I <3 GitLab", we only store "I ". This is
unexpected behaviour, since we want users to have a normal profile, without
having to worry what characters are allowed and which are not.

**Related issues:**
Fixes https://github.com/gitlabhq/gitlabhq/issues/5625

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-28 10:45:22 +02:00
Stan Hu ab88b7da19 Fix project snippets button appearing when it is disabled 
Closes #1705
 2015-05-27 05:07:44 -07:00
Dmitriy Zaporozhets 9eec0d5436 Merge branch 'accepted-rejected-mrs' into 'master' 
Add Accepted and Rejected tabs to MR lists.

Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.

![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png)

![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png)

![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png)

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

See merge request !702
 2015-05-27 11:40:36 +00:00
Dmitriy Zaporozhets 701c2e9a3b Merge branch 'rs-to_reference' into 'master' 
Add to_reference method to referable models

Now there is a single source of information for which attribute a model uses to be referenced, and its special character.

See merge request !641
 2015-05-27 10:03:14 +00:00
Douwe Maan 62d0ce19ed Merge branch 'fix-hipchat-default-api-version' into 'master' 
Allow HipChat API version to be blank and default to v2

### What does this MR do?

This MR fixes a regression introduced in v7.11 that requires a HipChat API version to be specified when it is supposed to be optional.

### Why was this MR needed?

The "optional" HipChat API version in 57c724558 passed in a blank `api_version` when nothing was specified, and the code was not tested. This would cause a 500 Error.

### What are the relevant issue numbers?

Closes #772

See merge request !718
 2015-05-27 07:27:03 +00:00
Stan Hu 0c9463174b Allow HipChat API version to be blank and default to v2 
Closes #772
 2015-05-26 21:57:24 -07:00
Robert Speicher 3cb6a33846 More SystemNoteService cleanup 2015-05-26 16:30:07 -04:00
Robert Speicher 1a9da9178c Surround Project.reference_pattern in parenthesis inside other patterns 2015-05-26 15:49:22 -04:00
Robert Speicher 5cc9b17b8a Make cross_project_reference? less magical 2015-05-26 15:49:21 -04:00
Robert Speicher 81a09bc74c Support only double quotes for multi-word label references 2015-05-26 15:49:20 -04:00
Robert Speicher 1a277c5025 Minor documentation updates 2015-05-26 15:48:32 -04:00
Robert Speicher b88da58cb6 Add reference_pattern to Referable models 2015-05-26 15:48:32 -04:00
Robert Speicher 136ab73803 Update CommitRange#to_reference to use full SHAs 
We only want them shortened by the filter, which calls to_s
 2015-05-26 15:48:31 -04:00
Robert Speicher 0359d41b06 Implement gfm_reference directly in Mentionable 
Except for Note, which still overrides it.
 2015-05-26 15:48:31 -04:00
Robert Speicher 8773f339a3 Minor model spec cleanups 
Snippet model was missing project association
 2015-05-26 15:48:30 -04:00
Robert Speicher c0faf91ff2 Add to_reference for models that support references 
Now there is a single source of information for which attribute a model
uses to be referenced, and its special character.
 2015-05-26 15:48:30 -04:00
Robert Speicher b06dc74d61 Add Referable concern 2015-05-26 15:48:30 -04:00