home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,497 Commits 48 Branches 340 Tags
48eccdb2fcfa28c2ab602b76b97ff064195bb113
Commit Graph
1131 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 1f893022fd Remove note from MR discussion when deleting it in the changes tab 2015-12-10 22:07:25 -02:00
Robert Speicher 3f4715322e Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' 
Fix editing notes on a merge request diff

Fixes #3910

See merge request !2041
 2015-12-10 19:22:53 +00:00
Dmitriy Zaporozhets d7044c5ccf Merge branch 'move-network' 2015-12-09 22:21:56 +01:00
Dmitriy Zaporozhets 7a4d468576 Merge remote-tracking branch 'origin/mr-broken' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 21:06:04 +01:00
Douglas Barbosa Alexandre 4a29669dec Merge branch 'master' into fix-edit-notes-on-merge-request-diff 2015-12-09 16:31:15 -02:00
Robert Speicher b255aad2d2 Merge branch 'rs-default-clone-fixes' into 'master' 
Simplify shared User SSH key steps

See merge request !2043
 2015-12-09 18:27:18 +00:00
Robert Speicher 7a2a860adc Simplify shared User SSH key steps 2015-12-09 12:09:00 -05:00
Dmitriy Zaporozhets 3cf4054854 Merge branch 'split-up-builds' into 'master' 
Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization



See merge request !2036
 2015-12-09 17:08:59 +00:00
Robert Speicher c3676aa156 Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' 
When rendering the clone page, check user profile to decide default
clone protocol

If the user has uploaded SSH-keys, use SSH; otherwise, use http(s).

Closes #3504.

See merge request !1998
 2015-12-09 16:52:43 +00:00
Dmitriy Zaporozhets 2c61e3c057 Fix test for network shortcut 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 17:47:45 +01:00
Dmitriy Zaporozhets 1954bd6ee0 Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' 
Signed in Admin can add/remove himself to a group/project

Fixes #3640 

/cc @JobV Could you have a look as well?

See merge request !1942
 2015-12-09 16:37:28 +00:00
Eirik Lygre bb79573c01 Merge branch 'master' into default_clone_protocol_based_on_user_keys 2015-12-09 15:07:10 +01:00
Douglas Barbosa Alexandre 9e5ac7285c Ensure notes are replaced on a merge request diff when they're updated 2015-12-09 11:30:21 -02:00
Douwe Maan 20b55981bc Tag feature specs 2015-12-09 10:50:28 +01:00
Dmitriy Zaporozhets 1d250b4892 Move Network page from separate tab to sub tab of Commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 02:50:46 +01:00
Eirik Lygre 94dc9ef9e1 Move ssh-key steps into SharedUser. Change references in "Explore Projects" feature. Apply ssh-key requirement to "Project Create" feature. 2015-12-09 02:02:53 +01:00
Dmitriy Zaporozhets 6213263d32 Merge branch 'mr-builds' into 'master' 
Add Builds tab to MR detail page

## Before

![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)

## After

![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)

Fixes #3907

See merge request !2016
 2015-12-09 00:05:23 +00:00
Eirik Lygre 430aa23a5b Add spinach tests for the clone protocol selection. 2015-12-09 00:20:51 +01:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master' 
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
 2015-12-08 22:04:52 +00:00
Douwe Maan fae08104b4 Merge branch 'master' into mr-broken 
# Conflicts:
#	app/helpers/ci_status_helper.rb
 2015-12-08 22:38:29 +01:00
Douwe Maan 0f89e6905d Fix spec 2015-12-08 22:31:40 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
 2015-12-08 22:26:29 +01:00
Douwe Maan 065375ca2d Use "Build passed" in tooltip instead of "Build status: passed" 2015-12-08 21:43:52 +01:00
Robert Speicher befff32ecb Merge branch 'languages-graph' into 'master' 
Languages graph

See merge request !2009
 2015-12-08 16:56:39 +00:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master' 
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
 2015-12-08 14:19:52 +00:00
Douwe Maan 5beacba038 Fix spec 2015-12-08 14:14:04 +01:00
Douglas Barbosa Alexandre bf0af030b6 Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group 2015-12-08 10:34:51 -02:00
Marin Jankovski 9bf51ae47d Fix specs caused by update of gitlab-test repo. 2015-12-08 10:58:15 +01:00
Dmitriy Zaporozhets 9b20731d4a Add tests and changelog item for language graphs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 02:38:59 +01:00
Robert Speicher e48391b813 Add custom ColorValidator 2015-12-07 16:57:26 -05:00
Dmitriy Zaporozhets 24ab860554 Merge branch 'fix-random-failing-test' into 'master' 
Fix random failing test

Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test

Improvement for !1897

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

See merge request !2004
 2015-12-07 20:55:22 +00:00
Dmitriy Zaporozhets 949a7e8e20 Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce 2015-12-07 20:17:29 +01:00
Dmitriy Zaporozhets 74d73bd953 Fix random failing test 
Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-07 20:09:30 +01:00
Marin Jankovski e53b350cb6 Add specs for showing lfs object in UI. 2015-12-07 15:03:50 +01:00
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' 
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
 2015-12-07 12:26:56 +00:00
Douglas Barbosa Alexandre 23c1c70bf0 Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group 2015-12-04 18:09:22 -02:00
Rubén Dávila aa1ba00936 Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 2015-12-04 10:43:33 -05:00
Stan Hu ba3c702073 Fix spec 2015-12-04 07:13:28 -08:00
Dmitriy Zaporozhets 238ca3e472 Merge remote-tracking branch 'origin/ui/issuable-form' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 15:12:03 +01:00
Dmitriy Zaporozhets eb9601d906 Merge branch 'ui/form-consistency' into 'master' 
UI: Improve form consistency

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Tag form

Before:

![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png)

After:

![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png)


See merge request !1955
 2015-12-04 09:27:27 +00:00
Dmitriy Zaporozhets abb7261889 Merge branch 'ui/wiki' into 'master' 
UI: Use new style for wiki

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png)

After:

![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png)

## Edit Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png)

After:

![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png)

See merge request !1967
 2015-12-03 20:17:48 +00:00
Douwe Maan e5c865eebf Fix specs 2015-12-03 20:01:35 +01:00
Douglas Barbosa Alexandre 9ca41f3ab2 Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group 2015-12-03 16:05:28 -02:00
Douwe Maan 494ebad39b Fix spec 2015-12-03 18:56:43 +01:00
Douwe Maan 5ab1b11e90 Fix specs 2015-12-03 18:42:37 +01:00
Douwe Maan 0cbb7717df Fix spec 2015-12-03 18:32:29 +01:00
Douwe Maan 90899b3208 Fix specs 2015-12-03 14:54:14 +01:00
Grzegorz Bizon 2b57755117 Add feature test for emoji-only diff notes 
This specs is related to bug described in #3734 (award-emojis).
 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 4676ba1f7c Add test for award-emoji being added as regular comment 2015-12-03 13:39:00 +01:00
Douwe Maan 97ddf2df00 Merge branch 'master' into ui/wiki 2015-12-03 13:29:35 +01:00