home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,891 Commits 48 Branches 340 Tags
59c3ec4e67f598e1a67df233f2d12fbec3d033dc
Commit Graph
10383 Commits
Author SHA1 Message Date
Douwe Maan 59c3ec4e67 Use file-type specific file icon in blame view and diff item 2015-12-02 14:55:36 +01:00
Douwe Maan a3da3d8e3b Use monospace font for commit SHA in branch list 2015-12-02 14:55:29 +01:00
Douwe Maan 90df3701e7 Add plus icon to all "Add X" buttons 2015-12-02 14:54:50 +01:00
Douwe Maan 40760d3f7b Add header title to import pages 2015-12-02 14:54:24 +01:00
Douwe Maan f8e577591b Don't use success state for "Download zip" button 2015-12-02 14:54:12 +01:00
Douwe Maan 12dd4c7c8a Use "Delete" in milestone and label delete buttons instead of "Remove" 2015-12-02 14:53:56 +01:00
Douwe Maan b8a926fab0 Don't use success state for explore projects search button 2015-12-02 14:53:28 +01:00
Douwe Maan e9e9f537e8 Truncate submodule commit SHAs to 7 characters 2015-12-02 14:53:20 +01:00
Douwe Maan 67ff47b39c Capitalize tab titles 2015-12-02 14:53:11 +01:00
Douwe Maan 080a0c026b Use same text color for commit box as issue title 2015-12-02 14:52:36 +01:00
Dmitriy Zaporozhets 09e712c0fb Merge branch 'rs-icon-link-transparency' into 'master' 
Make icon-link image transparent

[ci skip]

See merge request !1945
 2015-12-02 09:05:48 +00:00
Dmitriy Zaporozhets 3f5e999fe7 Merge pull request #9846 from fbeegle/master 
Update autocomplete_controller to be more readable
 2015-12-02 10:02:15 +01:00
Robert Speicher 9f30f5c635 Make icon-link image transparent 2015-12-01 18:20:01 -05:00
Stan Hu 9b10701258 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-01 00:31:42 -08:00
Stan Hu a518879a6f Merge pull request #9868 from yms9654/commit-without-whitespace 
Add ignore whitespace change option to commit view
 2015-12-01 00:30:39 -08:00
Minsik Yoon 8c4a3c77d8 Add ignore whitespace change option to commit view 2015-12-01 09:51:10 +09:00
Valery Sizov 13c6096e42 Merge branch 'upload_hook' into 'master' 
Fire update hook from GitLab

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

See merge request !1882
 2015-11-30 17:22:00 +00:00
Robert Speicher 244c9a00e0 Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal' 
See merge request !1916
 2015-11-30 12:00:13 -05:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master' 
Rails update to 4.2.4

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

See merge request !1902
 2015-11-30 16:49:09 +00:00
Valery SizovandValery Sizov ae18ba1632 Fire update hook from GitLab 2015-11-30 18:36:34 +02:00
Valery Sizov f1504e1ad5 test fix 2015-11-30 18:03:07 +02:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Dmitriy Zaporozhets d73d2a5e58 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-30 10:24:40 +01:00
Dmitriy Zaporozhets f41634c7f6 Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' 
Show Gmail actions links only on expected set of emails



See merge request !1901
 2015-11-30 09:23:56 +00:00
Dmitriy Zaporozhets 69e9c4143b Merge branch 'expire-application-settings-startup' of https://gitlab.com/stanhu/gitlab-ce 2015-11-30 10:23:25 +01:00
Valery Sizov 461731f076 fix notification_service specs 2015-11-30 11:21:10 +02:00
Dmitriy Zaporozhets c48518ac21 Merge branch 'fix-admin-page-personal-projects' into 'master' 
Fix Error 500 when viewing user's personal projects from admin page

This is a regression introduced in 4d7f00f.

Closes #3680

Closes https://github.com/gitlabhq/gitlabhq/issues/9861

Closes gitlab-org/gitlab-ee#90

See merge request !1909
 2015-11-30 09:18:59 +00:00
Dmitriy Zaporozhets 0a1b50ef3f Merge branch 'rs-clone-panel' into 'master' 
Add clipboard button for project clone panel

Closes #3585 

Project:

![Screen_Shot_2015-11-24_at_7.34.04_PM](/uploads/8bf73a2816f2525896023c36aea402bc/Screen_Shot_2015-11-24_at_7.34.04_PM.png)

Wiki:

![Screen_Shot_2015-11-24_at_7.34.43_PM](/uploads/ddf400a1c979a1d8b535a34877cd6163/Screen_Shot_2015-11-24_at_7.34.43_PM.png)


See merge request !1896
 2015-11-30 09:17:39 +00:00
Robert Speicher 3723182a88 Move project visibility level off of the clone panel 2015-11-27 16:15:06 -05:00
Douwe Maan 8f4b6d51f0 Merge branch 'jcorcuera/gitlab-ce-issue_3428' 2015-11-27 12:53:10 +01:00
Stan Hu 312e3b1e16 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2015-11-26 08:14:10 -08:00
Stan Hu 2f90e71fd3 Merge pull request #9670 from janten/gravatar-retina 
Add support for HiDPI displays in gravatar service
 2015-11-26 08:13:28 -08:00
Jose Corcuera b9df1a6355 Strip attributes for Milestone and Issuable. #3428 2015-11-26 10:16:50 -05:00
Valery SizovandValery Sizov 7f214cee74 Migrate mailers to ActiveJob 2015-11-26 17:03:43 +02:00
Douwe Maan 68a4533818 Merge branch 'rs-markdown-preview' into 'master' 
Decouple Markdown previews from DropzoneInput



See merge request !1908
 2015-11-26 13:05:25 +00:00
Douwe Maan c887045cd2 Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow' 2015-11-26 14:03:51 +01:00
Valery Sizov 3e0fe27627 Merge remote-tracking branch 'origin/master' into rails_update_to_4_2 2015-11-26 12:30:28 +02:00
Stan Hu 2497d3d550 Fix 404 in redirection after removing a project 
Closes https://github.com/gitlabhq/gitlabhq/issues/9844

Closes #3559
 2015-11-25 23:11:35 -08:00
Robert Speicher 5f0d1f30b0 Remove enumerize gem 2015-11-25 17:06:04 -05:00
Stan Hu 36bde0fcb1 Fix Error 500 when viewing user's personal projects from admin page 
This is a regression introduced in 4d7f00f.

Closes #3680
 2015-11-25 14:00:35 -08:00
Robert Speicher 73eca2a95e Decouple Markdown previews from DropzoneInput 2015-11-25 16:36:04 -05:00
Douglas Barbosa Alexandre 8dcef120cd Fix raw private snippets access workflow 2015-11-25 18:16:27 -02:00
Stan Hu e55473ad68 Expire application settings from cache at startup 
If a DB migration occurs, there's a chance that the application settings are
loaded from the cache and provide stale values, causing Error 500s.
This ensures that at startup the settings are always refreshed.

Closes #3643
 2015-11-25 11:30:33 -08:00
Dmitriy Zaporozhets dee28c50a9 Merge branch 'new-member-page' into 'master' 
Improve group and project members pages

* Improve UI for group members page
* Improve UI for project members page

For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057

This MR should solve usability problem with adding new member to group/project 

See merge request !1886
 2015-11-25 18:20:22 +00:00
Valery Sizov 40ff1318d2 Rails update to 4.2.4 2015-11-25 18:18:44 +02:00
Marin Jankovski 5613592727 If action link is not found, return nil. 2015-11-25 13:53:02 +01:00
Yorick Peterse ef2bc0f0bf Merge branch 'sherlock-total-query-time' into 'master' 
Added total query time to Sherlock

This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).

See merge request !1887
 2015-11-25 11:29:48 +00:00
Dmitriy Zaporozhets d262daa4f0 Split group feature tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 11:44:39 +01:00
Dmitriy Zaporozhets 34cc8f4a60 Improve project members page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets d9749c8d36 Improve UI for group members page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00