home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,436 Commits 48 Branches 340 Tags
896eb0aa136eb7e442208083df4e945df17c7bfe
Commit Graph
8809 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9322e52432 Always show approvers list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 15:46:57 +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
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 449903f21b Dont allow approvals requirement be less than zero 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 18:23:00 +02:00
Dmitriy Zaporozhets 32384cf7d1 Move EE merge request settings into separate fieldset 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 18:13:41 +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 15b17b3f6a Implement approve button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 16:12:52 +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
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 356bafcbb4 Merge branch 'fix_edit_notes_form_hotkey_issue' into 'master' 
Make submit hotkey available to all notes forms.

Addresses #2221.

See merge request !1847
 2015-06-09 11:13:42 +00:00
Dmitriy Zaporozhets 18e33e037f Merge branch 'fix-missing-js' into 'master' 
Move page-specific JS out of head and into body.

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

See merge request !787
 2015-06-09 10:39:10 +00:00
Douwe Maan eb80edd34f Move page-specific JS out of head and into body. 2015-06-09 12:01:18 +02:00
Douwe Maan 844cca4a1e Add Git hook to validate maximum file size. 2015-06-09 10:23:38 +02:00
Nicolas a68eabd212 Make submit hotkey available to all notes forms. 
Addresses #2221.
 2015-06-09 05:31:21 +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 b637f84950 Fix broadcast message colors to one displayed in preview 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 20:39:02 +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 78d4b6ae8d Remove arrow to the right of project name on dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 17:27:50 +02:00
Dmitriy Zaporozhets d46d6fc17b Improve UI for phones 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:54:39 +02:00
Dmitriy Zaporozhets 8641cda4a5 Dont use fixed pixel size if form controls - its bad for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:34:58 +02:00
Dmitriy Zaporozhets ebaa1e5a89 Fix header for mobiles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:34:07 +02:00
Dmitriy Zaporozhets 9b77a4baf9 Dont truncate issue/mr title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:33:33 +02:00
Dmitriy Zaporozhets 61a3cd6351 Move logout buttom to top right corner 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 15:50:26 +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