home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 20:56:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 1343b2dfac Merge pull request #8785 from jvanbaarsen/rspec-upgrade 
Rspec upgrade
 2015-02-12 16:47:06 -08:00
Dmitriy Zaporozhets f9880c11f7 Merge pull request #8779 from KelvinMutuma/show-assignees-in-merge-requests-index 
Show assignees in the merge-requests index
 2015-02-12 14:46:41 -08:00
Dmitriy Zaporozhets 1d9e9c1b92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-12 14:43:28 -08:00
Dmitriy Zaporozhets 2be3a012ff Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-12 14:43:02 -08:00
Jeroen van Baarsen 6860004466 Fixed deprecation in spinach stubs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 21:22:23 +01:00
Sytse Sijbrandij e629c45d88 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-12 12:09:38 -08:00
Sytse Sijbrandij d899bc914f Merge branch 'gitattributes-merge-union' into 'master' 
Use gitattribute merge=union to reduce CHANGELOG merge conflicts.

See gitlab/organization#137.

Tested and found working!

@sytse How would you like to address this in [the article](https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/)? Simply replace "Thanks ayufan, we'll try this instead." by "Thanks ayufan, we've implemented this instead."?

See merge request !1505
 2015-02-12 20:05:36 +00:00
Dmitriy Zaporozhets 714ca5189e Merge branch 'issues_tracker_template' into 'master' 
Issues trackers template

If admin defines service template, service in project will be prefilled with the template data.

See merge request !1503
 2015-02-12 20:02:23 +00:00
Jeroen van Baarsen 026e988544 Even more hound fixes 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 21:00:55 +01:00
Douwe Maan 4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00
Marin Jankovski e8271226b1 Use the service_name. 2015-02-12 10:57:08 -08:00
Marin Jankovski 378520bd8b Add a test for service template. 2015-02-12 10:53:01 -08:00
Jeroen van Baarsen 5bb743efec Fixed tests for spinach 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:48:42 +01:00
Jeroen van Baarsen 940a402b6e Fixed hound warnings 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:32:58 +01:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:17:35 +01:00
Marin Jankovski 9f33898f7a All services can have templates. 2015-02-12 09:19:55 -08:00
Jeroen van Baarsen de1c450abd Started on the rspec upgrade 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 16:48:53 +01:00
Jeroen van Baarsen d9f84f6867 Merge pull request #8445 from jvanbaarsen/project-spec-speed-up 
requests/api/project_spec.rb speed up
 2015-02-12 11:26:09 +01:00
Jeroen van Baarsen b92a6f7c24 Merge pull request #8739 from jvanbaarsen/pr/7818 
note about latest details being on master branch
 2015-02-12 11:25:40 +01:00
Dmitriy Zaporozhets cab72628ff Merge branch 'master' into 'master' 
Adds new label color suggestions

This adds a bunch of label color suggestions

![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png)
![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png)

See merge request !289
 2015-02-12 07:17:46 +00:00
Dmitriy Zaporozhets 30cf916b26 Merge branch 'api-edit-groups' into 'master' 
Edit group members via API

Fixes #1840.  Implement a new API endpoint to update the access level of an existing group member.  Includes new tests and updated API docs.

cc @sytse @douwe

See merge request !1504
 2015-02-12 06:47:39 +00:00
Kelvin Mutuma 783ecc9a2f Show Work In progress if a merge request is not assigned 2015-02-12 05:59:38 +03:00
Kelvin Mutuma e3ecdb4810 Show assignees in the merge-requests index 2015-02-12 05:41:47 +03:00
Marin Jankovski f7e9024535 Remove unecessary icon. 2015-02-11 18:36:40 -08:00
Marin Jankovski b3f944a398 Annotate services. Add a link to service template. 2015-02-11 18:29:24 -08:00
Marin Jankovski 6b4ddf2cc1 Add admin services templates. 2015-02-11 17:55:33 -08:00
Vinnie Okada b0dacc8eb0 Edit group members via API 
Add an API endpoint to update the access level of an existing group
member.
 2015-02-11 18:53:07 -07:00
Sytse Sijbrandij 0495395054 Merge pull request #8750 from wtw/master 
Revise main README for cleanup and some minor clarifications
 2015-02-11 17:45:07 -08:00
Sytse Sijbrandij 0a97b1b1a7 Merge pull request #8778 from al3x-edge/fix-emoji-link 
Update Emoji Cheat Sheet Link
 2015-02-11 17:04:38 -08:00
Alexander AmbroseandAlexander Ambrose e8335a65e3 Change emoji cheat sheet link to Amazon S3 
The emoji cheat sheet link was changed. Commit changes the url to the
updated link and fixes issue #8554.
 2015-02-11 20:02:24 -05:00
Dmitriy Zaporozhets e71805db8a Merge branch 'ssh-link' into 'master' 
Fix link to SSH help page.

Closes #1981.

See merge request !1502
 2015-02-11 23:34:24 +00:00
Sytse Sijbrandij c8e5dfef67 Merge branch 'issue_1064-fix_broken_doc_links' into 'master' 
Fix Issue 1064

Fixes broken doc links within the installation section, as described in:

https://gitlab.com/gitlab-org/gitlab-ce/issues/1064

See merge request !334
 2015-02-11 22:25:26 +00:00
Dmitriy Zaporozhets 36bbd5affb Merge branch 'mobile-maximum-scale-1' into 'master' 
Don't allow page to be scaled on mobile and add horizontal scrolling to code blocks

Closes #1974.

Previously, scaling (both automatically and manually) was enabled on mobile, which caused the top and sidebar to move over content. Scaling is now disabled.

Also previously, code in issues or comments too wide to fit inside the width of the window would "flow out" on the right, causing the whole page to become very wide and causing scrolling to scroll the entire page instead of just the code. Code blocks now scroll themselves.

See merge request !1501
 2015-02-11 22:08:22 +00:00
Dmitriy Zaporozhets d1ad5b5378 Merge branch 'fix-command-enter' into 'master' 
Actually submit comment on command-enter.

Resolves #1869.

Because !1474 didn't actually work.

cc @sytse

See merge request !1499
 2015-02-11 21:56:44 +00:00
Douwe Maan 452b3612cf Fix link to SSH help page. 
Closes #1981.
 2015-02-11 22:15:10 +01:00
Marin Jankovski 09d3d351a1 Remove not null constraint on project_id in services. 2015-02-11 09:47:21 -08:00
Marin Jankovski 5515366064 Add template boolean to services. 2015-02-11 09:24:40 -08:00
Marin Jankovski 29e606deec Add ExternalIssue base model to make issue referencing more robust for external issue trackers. 2015-02-11 09:21:57 -08:00
Ewan Edwards 93bd185efe Fix two broken links in the installation section. 2015-02-11 08:49:37 -08:00
Douwe Maan 27e521720a Add horizontal scrolling to code blocks. 2015-02-11 17:40:03 +01:00
Douwe Maan d909ae73dc Actually submit comment on command-enter. 
Resolves #1869.
 2015-02-11 12:21:11 +01:00
Benjamin Kammerl 7606b93c26 Change label color text field type to "color" 2015-02-11 10:02:36 +00:00
Dmitriy Zaporozhets 2dfd219834 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-10 22:19:15 -08:00
Dmitriy Zaporozhets c32e52706f Merge branch 'bump_gitlab_shell' into 'master' 
Bump gitlab shell

See merge request !1497
 2015-02-11 01:36:02 +00:00
Dmitriy Zaporozhets 3c4f7f50fa Merge branch 'add_label_notes' into 'master' 
Add label notes

It creates system note, when someone changed labels of issue/MR.

Just look at the screenshot:

![labels](https://gitlab.com/uploads/vernik91/gitlab-ce/ebbdba6bdc/labels.png)

Solves this [request] (http://feedback.gitlab.com/forums/176466-general/suggestions/6623258-create-a-note-when-issue-labels-change).

*P.S. Thanks this [PR](https://github.com/gitlabhq/gitlabhq/pull/8237) for idea 😉. But I need this feature as soon as possible.*

See merge request !331
 2015-02-11 01:34:33 +00:00
Marin Jankovski 653be1fe8a Merge branch 'issue-closing-pattern' into 'master' 
Extend issue clossing pattern

New: "Resolve", "Resolves", "Resolved", "Resolving" and "Close"

Now matches those supported by [GitHub](https://help.github.com/articles/closing-issues-via-commit-messages/), with the addition of the -ing forms.

See merge request !1475
 2015-02-11 00:41:19 +00:00
Nikita Verkhovin 43cf295ab6 Add labels notes to Changelog 2015-02-11 00:36:35 +06:00
Dmitriy Zaporozhets 69c7ea1659 Bump gitlab-shell version 2015-02-10 10:31:54 -08:00
Dmitriy Zaporozhets a3681c0f98 Merge branch 'cleanup-gitlab-example' into 'master' 
Cleanup gitlab example

Fixes #1938

See merge request !1495
 2015-02-10 18:17:42 +00:00
Dmitriy Zaporozhets 299340ad0e Merge branch 'broadcast-message-api' into 'master' 
Add internal broadcast message API.

See gitlab/gitlab-ee#241.

Used by gitlab/gitlab-shell!53.

See merge request !1486
 2015-02-10 18:13:39 +00:00