home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,984 Commits 48 Branches 340 Tags
d222ce8b348ff2f6c76c3f1b05f8a4e91efcf0b4
Commit Graph
1203 Commits
Author SHA1 Message Date
Douwe Maan 8710739e4e Correctly find last known blob for file deleted in MR. 2015-10-20 14:24:02 +02:00
Douwe Maan 8adeda37b5 Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'master' 
Add ability to remove the fork relationship from project settings

![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png)
![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png)

Replaces !1579.

Fixes #2578.

See merge request !1636
 2015-10-19 09:32:07 +00:00
Dmitriy Zaporozhets a148c06cf8 Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' 
Allow users to select the Files view as default project view


![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png)

Also shows the readme at the very bottom, like on the regular Files page.


Replaces !1489.

Closes #2655.

See merge request !1632
 2015-10-19 09:27:37 +00:00
Douwe Maan 41615ddde4 Merge branch 'cross-reference-mr-on-issues' into 'master' 
Show merge requests which close current issue

Closes #2903

### What does this MR do
If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue.

![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png)

/cc @DouweM

See merge request !1569
 2015-10-18 12:07:28 +00:00
Douwe Maan 42cbc7f813 Tweak wording. 2015-10-18 12:38:01 +02:00
Douwe Maan 6f0856535e Remove redundant helper method. 2015-10-17 19:16:04 +02:00
Douwe Maan 70240f433c Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-files 2015-10-17 18:20:04 +02:00
Douwe Maan 5ad3a274b3 Merge branch 'rs-redactor-filter' into 'master' 
Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects

Related: !1014

See merge request !1090
 2015-10-17 11:55:55 +00:00
Dmitriy Zaporozhets efd5472c4b Hide Builds tab is GitLab CI is not enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-17 09:38:29 +02:00
Han Loong Liauw 02e8beaa0b Merge branch 'master' into remove-forks-from-projects-settings 2015-10-17 09:32:31 +11:00
Robert Speicher c856a7a593 Merge branch 'filter-label' into 'master' 
Allow dashboard and group issues/MRs to be filtered by label

See merge request !1591
 2015-10-16 21:29:47 +00:00
Douwe Maan 34148d1576 Merge branch 'master' into rs-redactor-filter 2015-10-16 11:26:48 +02:00
Zeger-Jan van de Weg 94a788f66d Only accept open issues and merge requests 2015-10-16 09:59:32 +02:00
Zeger-Jan van de Weg 9f9f0c35ec Show merge requests which close current issue 2015-10-16 09:46:59 +02:00
Kamil Trzcinski 71d0cfcff6 Make the builds view and warning notice nicer 2015-10-15 17:14:01 +02:00
Dmitriy Zaporozhets c0a6836be4 Merge branch 'view-issue-performance' 2015-10-15 14:37:04 +02:00
Kamil Trzciński daccc54d25 Merge branch 'builds-view' into 'master' 
Added builds view

![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png)

/cc @dzaporozhets @vsizov 


See merge request !1593
 2015-10-15 11:35:57 +00:00
Yorick Peterse ff8f7fb0a1 Re-use User for avatars in link_to_member 2015-10-15 12:05:01 +02:00
Yorick Peterse 693e63f523 Allow avatar_icon to operate on a User 
If the User object is already known before calling this method being
able to re-use said object can save us an extra SQL query.
 2015-10-15 12:05:01 +02:00
Douwe Maan 95f0440a78 Merge branch 'master' into rs-redactor-filter 2015-10-15 11:26:58 +02:00
Robert Speicher 9750de4943 Simplify the issues_sentence helper 2015-10-14 16:30:19 -04:00
Kamil Trzcinski d9e2232f63 Fix warning sign 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 7af4f5215e Show warning if build doesn't have runners with specified tags or runners didn't connect recently 
Slightly refactor runner status detection: moving it to Runner class

Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
 2015-10-14 17:29:18 +02:00
Kamil Trzcinski a957eca6f3 Added builds view 2015-10-14 17:28:38 +02:00
Douwe Maan 3a69dd20a1 Allow dashboard and group issues/MRs to be filtered by label 2015-10-14 12:33:39 +02:00
Douwe Maan 5dd77358f6 Pass project to RedactorFilter 2015-10-13 13:36:47 +02:00
Han Loong Liauw df99ddbba1 Adds ability to remove the forked relationship 
This was previously possible through the API but can now be done
through the project#edit settings screen if the current user is
the owner of the project.
Update changelog
 2015-10-13 21:42:17 +11:00
Stan Hu b60bc655f2 Restore placeholders in issue filters from "Any" to "Milestone" and "Label" 
1f11096c included new filters but made it hard to determine which dropdown did
what. This patch restores the original placeholders.
 2015-10-08 23:53:32 -07:00
Douwe Maan f42cfa9e87 Refactor reference gathering to use a dedicated filter 2015-10-07 17:00:48 +02:00
Stan Hu dfbbc80611 Support filtering by "Any" milestone or issue and fix "No Milestone" and "No Label" filters 
Closes #2619

Closes https://github.com/gitlabhq/gitlabhq/issues/9631
 2015-10-07 07:21:50 -07:00
Douwe Maan 12626f029d Return strings where expected 2015-10-07 15:22:28 +02:00
Douwe Maan 4f629dab2a Merge branch 'master' into rs-redactor-filter 2015-10-07 15:15:35 +02:00
Dmitriy Zaporozhets 82b6a17ca7 Fix ci build routing and few tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 21:41:37 +02:00
Dmitriy Zaporozhets 04c7dc2a9e Cleanup CI code after refactoring and fix several 500 errors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:15:06 +02:00
Dmitriy Zaporozhets f509e3afeb Link ci_status_path to new ci commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 16:21:19 +02:00
Dmitriy Zaporozhets 3d90560c1e Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-05 20:14:32 +02:00
Peter Göbel 291e1fa930 improved code style and layout option naming 2015-10-05 18:09:05 +02:00
Peter Göbel e2c5d08e7e added user preference to change layout width 2015-10-05 17:22:47 +02:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Kamil Trzcinski 546a3c6561 Refactor commit and build 2015-10-05 09:52:35 +02:00
Guilherme Garnier 1cfb48ddd0 Merge remote-tracking branch 'upstream/master' 2015-10-03 11:46:29 -05:00
Guilherme Garnier 2b075f16c7 Fix rubocop warnings in app 2015-10-03 00:56:37 -05:00
Stan Hu 3fbcc51102 Update README cache key to use full project namespace 2015-10-02 13:26:42 -07:00
Stan Hu 1c53c28c79 Merge pull request #9684 from NKMR6194/master 
Fix link with emoji
 2015-10-01 14:10:34 -07:00
SAKATA Sinji a3c6ed5c46 Fix link with emoji 2015-10-02 01:26:19 +09:00
Cristian Bica c528043439 Allow users to select the Files view as default project view 2015-10-01 17:05:20 +03:00
Dmitriy Zaporozhets 4c43d846f2 Fix 500 error on compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-01 14:12:43 +02:00
Stan Hu 5544d54793 Include full path of source and target branch names in New Merge Request page 
Previous title would only show the group name, which could be confusing.

Closes #2875
 2015-09-30 20:50:53 -07:00
Dmitriy Zaporozhets 247385a702 Merge branch 'fix-removed-file-in-diff' into 'master' 
Fix bug when removed file was not appearing in merge request diff

Finally we can see removed files in merge request diff ✨ 

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

Fixes #2533 

See merge request !1471
 2015-09-30 15:41:22 +00:00
Dmitriy Zaporozhets fe7e97320c Fix bug when removed file was not appearing in merge request diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-30 12:31:23 +02:00