home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +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 1ce14dd759 Merge branch 'fix-xmlns-namespacing-atom-feeds' into 'master' 
Fix xmlns:media namespacing for atom feeds

A recent commit gitlab-org/gitlab-ce@d31d711a70 introduced a bug that broke four of the atom feeds. The namespace for xmlns:media was not defined properly. This patch fixes the issues for all four feeds.

See merge request !274
 2015-01-05 19:13:21 +00:00
Dmitriy Zaporozhets dbdccd5d03 Merge pull request #8534 from jvanbaarsen/fix-wonky-tests 
make sure the user.name is escaped
 2015-01-05 21:10:23 +02:00
Robert Schilling 0c07da8887 Merge branch 'use_plural' into 'master' 
Use plural on permissions doc

See merge request !276
 2015-01-05 17:34:01 +00:00
Jacob Vosmaer 52bc4e79f8 Close standard input in Gitlab::Popen.popen 2015-01-05 11:51:21 +01:00
Achilleas Pipinellis 9993a0e356 Use plural instead of refering explicitly to male/female. 2015-01-05 12:44:42 +02:00
Jeroen van Baarsen 2a4ee2fd7f make sure the user.name is escaped 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-01-04 14:09:35 +01:00
Dmitriy Zaporozhets 5dbbec4612 Merge pull request #8520 from cirosantilli/edit-blob-link-tests 
Add tests for disabled blob edit button cases v2
 2015-01-03 14:07:43 +02:00
Dmitriy Zaporozhets e8fc5591a2 Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-01-03 11:14:05 +02:00
Dmitriy Zaporozhets 252e4fd996 Merge pull request #8489 from yglukhov/wiki-md-preview 
Markdown preview in wiki
 2015-01-03 11:05:42 +02:00
Dmitriy Zaporozhets d1ca3544f9 Merge pull request #8528 from Razer6/fix_group_avatar 
Raise group avatar filesize limit to 200kb, fixes #8527
 2015-01-03 11:03:05 +02:00
Robert Schilling 05dd6309ba Raise group avatar filesize limit to 200kb, fixes #8527 2015-01-02 14:54:51 +01:00
Ciro Santilli 67b06e7a9b Change always passing visible true tests to false. 2015-01-02 00:20:19 +01:00
Ciro Santilli 33c9f05c6b Append in place for strings and arrays 2015-01-01 21:12:00 +01:00
Jeremy Maziarz e5c0e2603a Fix xmlns:media namespacing for atom feeds 2014-12-31 15:05:38 -05:00
marmis85 021cff67f3 Flatten the directory hierarchy while there is only one directory descendant 2014-12-31 03:15:04 +01:00
Arif Ali 1d8dcfaf8b fix deleted file display when using new gitlab_git gem, and add new gitlab_git gem 2014-12-30 21:59:38 +00:00
Dmitriy Zaporozhets ac1584249c Merge branch 'improve-merge-widget' into 'master' 
Improve merge widget

* remove title `You can merge it` since button below says same
* fixed layout for custom commit message
* make button a bit bigger

See merge request !1365
 2014-12-30 18:47:29 +00:00
Dmitriy Zaporozhets 884352294d Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 20:10:46 +02:00
Stephan van Leeuwen 25c37b0e73 Fixed issue not being able to create a new issue on an empty project. 2014-12-30 18:53:46 +01:00
Ciro Santilli 18fa155025 Add tests for disabled blob edit button cases. 2014-12-30 18:19:48 +01:00
Ciro Santilli 3a3b0da81e Make blob new and edit file editors more uniform 2014-12-30 17:44:31 +01:00
Dmitriy Zaporozhets 6e217bd55c Improve accept mr widget UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 17:28:34 +02:00
Marin Jankovski 0da5154b5a Fix api tests. 2014-12-30 15:40:11 +01:00
Dmitriy Zaporozhets c957285727 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-30 16:39:10 +02:00
Dmitriy Zaporozhets 0930086bea Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 16:38:27 +02:00
Dmitriy Zaporozhets 792b9920fc Merge pull request #8513 from dblessing/fix_hipchat 
Fix HipChat Server
 2014-12-30 16:38:03 +02:00
Marin Jankovski 7240150c89 Forward the messages in api response. 2014-12-30 15:17:46 +01:00
Dmitriy Zaporozhets 2010ae11f3 Merge branch 'merge-request-commits-view' into 'master' 
Merge request commits view

Changes the commits view of a merge request to use the same layout as used in the project commits view.

As noticed from #923.

This also changes the commits icon on the tab to be fa-history, the same as used in the sidebar

Screenshots [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/8785737424/Screenshot_from_2014-12-29_20_39_25.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/a3bf2a790f/Screenshot_from_2014-12-29_20_40_23.png)

See merge request !271
 2014-12-30 13:40:13 +00:00
Marin Jankovski ed464edabe Message for api files and groups. 2014-12-30 14:29:55 +01:00
Marin Jankovski d4b613ded7 Clearer message if adding comment to commit via api fails. 2014-12-30 14:00:07 +01:00
Marin Jankovski 7fa80b5bd0 Update branch api not found messages to 'Branch not found'. 2014-12-30 13:37:14 +01:00
Dmitriy Zaporozhets 0991d19c0d Merge branch 'user_ssh_keys_on_admin' into 'master' 
User ssh keys on admin

Show user ssh keys on admin user page.

See merge request !1362
 2014-12-30 12:02:16 +00:00
Marin Jankovski eb29648bf4 Fix the ssh keys test. 2014-12-30 11:47:13 +01:00
Dmitriy Zaporozhets 394e2ec50b Merge branch 'ajax-group-select' into 'master' 
Ajax group select

Helper method for creatins select2 selectbox with ajax query to groups via API

See merge request !1363
 2014-12-30 10:31:59 +00:00
Marin Jankovski 607ea7c6e5 Share the key table between admin and profile resources. 2014-12-30 11:01:30 +01:00
Dmitriy Zaporozhets 5d2e637c17 Group selectbox js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:48 +02:00
Dmitriy Zaporozhets 27ee0fc57b Helper for ajax group selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Dmitriy Zaporozhets 2660e83c97 Add group filtering by name for API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Drew Blessing 9f9f1b3b87 Fix HipChat Server 2014-12-29 18:51:39 -06:00
Dmitriy Zaporozhets da9d827904 Merge branch 'inline-protected-branches' into 'master' 
Improve UI for protected branches

See merge request !1361
 2014-12-29 21:08:21 +00:00
Dmitriy Zaporozhets 95cd5b275a Prevent content overflow for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 22:59:08 +02:00
Stephan van Leeuwen b753bfd145 Updated issuable form to only show create links if allowed, and added contribution guide url to form actions. 
Also changed icon for labels.
Removed contribution guide notice from issue form.
 2014-12-29 20:29:59 +01:00
Stephan van Leeuwen 4fe699fdc3 Updated create merge request submit view 
Create merge request submit view now uses the same form layout as creating an issue.
The commits view now uses the same layout as the project commits view
The commits and diffs are now in separate tabs, as used in the merge request view
 2014-12-29 20:14:51 +01:00
Dmitriy Zaporozhets a9cf84e5ac Merge pull request #7675 from yglukhov/patch_notes_api 
Implemented notes (body) patching in API.
 2014-12-29 21:06:49 +02:00
Dmitriy Zaporozhets 159ba9b958 Merge pull request #8496 from NARKOZ/644 
chmod -x
 2014-12-29 21:04:58 +02:00
Chulki Lee 2b90aa0ec0 Update gems for ruby 2.2.0 2014-12-29 10:22:47 -08:00
Stephan van Leeuwen b97b854963 Updated merge request commits view 
The merge request commits tab now uses the same layout as used in the project commits view
 2014-12-29 19:10:53 +01:00
Marin Jankovski c1e57b47b8 Add feature spec for user ssh keys on admin page. 2014-12-29 18:40:25 +01:00
Dmitriy Zaporozhets 95c0393789 Inline protected branches list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:30:27 +02:00