home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,732 Commits 48 Branches 340 Tags
ef9298febbe5d84b641fcef4e4c9f8997e17a15a
Commit Graph
5732 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets ef9298febb Merge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev 2013-07-01 15:43:35 +00:00
Dmitriy Zaporozhets 6e550af150 Show shotcut dialog on ? 2013-06-30 22:10:52 +03:00
Dmitriy Zaporozhets 0f84833c33 Remove capistrano files since its very problematic to deploy gitlab with it 2013-06-30 19:19:06 +03:00
Dmitriy Zaporozhets a54f2d512a Update gitlab_git version 2013-06-30 19:14:27 +03:00
Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev 
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
 2013-06-30 11:35:40 +03:00
Dmitriy Zaporozhets d9c02f30e5 Merge pull request #4460 from tstone2077/feature_help_markdown 
Adding detailed documentation of the markdown syntax.
 2013-06-30 01:22:21 -07:00
Dmitriy Zaporozhets c7da44d6d1 Fixed db/schema.rb 2013-06-30 11:20:57 +03:00
Ariejan de Vroom 2b4bebd9f2 Doc: set permission on config.database.yml 2013-06-29 17:31:08 +03:00
Ariejan de Vroom b8ce544703 Merge branch 'bbodenmiller-master' 
Closes #4331
 2013-06-29 17:19:15 +03:00
Ariejan de Vroom ab36cdec84 Tweak wording and phrasing 2013-06-29 17:19:10 +03:00
Ariejan de Vroom 729c74320a Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master 2013-06-29 17:13:47 +03:00
Ariejan de Vroom 7fb9047223 Merge branch 'muskox-master' 
Closes #4424
 2013-06-29 16:37:51 +03:00
Scott PustayandAriejan de Vroom 2000f013f7 fixed typo in assgned 2013-06-29 16:37:41 +03:00
Dmitriy Zaporozhets 0904cc485c Classic theme: Dark color for header links. White color for loading spinner 2013-06-29 09:05:26 +03:00
Thurston StoneandThurston Stone 2a601d26f2 Adding detailed documentation of the markdown syntax. 
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
 2013-06-29 00:44:24 -05:00
Dmitriy Zaporozhets 28d517f58e Reduce the size of main nav 2013-06-29 08:35:52 +03:00
Dmitriy Zaporozhets 7ae72e6511 Merge pull request #4323 from axilleas/update_docs 
Create uploads dir otherwise backup fails. Fix #4304
 2013-06-28 21:55:13 -07:00
Dmitriy Zaporozhets 3e4de1ded4 Use triangle for current tab highlight 2013-06-28 23:33:14 +03:00
Dmitriy Zaporozhets f15e8a0cfe better align for main-nav 2013-06-28 23:11:27 +03:00
Dmitriy Zaporozhets b143976bfa Fixed showing files, commits tabs for empty project 2013-06-26 23:00:15 +03:00
Dmitriy Zaporozhets 49fcbdbd1e Test user page with spinach 2013-06-26 21:50:47 +03:00
Dmitriy Zaporozhets 6c0fd9f29a Add scenario for expired password 2013-06-26 21:34:20 +03:00
Dmitriy Zaporozhets 318b50a0b3 Add profile notification spinach 2013-06-26 20:54:51 +03:00
Dmitriy Zaporozhets 6642709faa Fix route specs 2013-06-26 20:17:07 +03:00
Dmitriy Zaporozhets d0779d61d3 Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatars 
Gravatar image fixes when gravatar unavailable
 2013-06-26 10:10:14 -07:00
Dmitriy Zaporozhets 467e7c10b5 Add more autocomplete options to project search 2013-06-26 19:25:07 +03:00
Dmitriy Zaporozhets 01cf474fa1 Fix spinach test 2013-06-26 19:13:29 +03:00
Dmitriy Zaporozhets 3c4689c23c Store satellites lock files inside satellites dir 2013-06-26 18:35:32 +03:00
Dmitriy Zaporozhets 9f087fb9e7 more entries in changelog 2013-06-26 18:15:50 +03:00
Izaak Alpert d1da45e1a3 Rebasing on master 
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
 2013-06-26 11:08:55 -04:00
Dmitriy Zaporozhets f50cb7fc9f Add keyboard nav for tree view. Refactor tree-view coffee 2013-06-26 16:58:56 +03:00
Dmitriy Zaporozhets 1dd80d22a5 Prevent confusion in naming user variable at admin area 2013-06-26 15:57:02 +03:00
Izaak Alpert c1b05e7b86 Gravatar image fixes when gravatar unavailable 
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar  wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)

Conflicts:
	app/assets/stylesheets/themes/ui_bb.scss
	app/views/snippets/_snippet.html.haml

Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
 2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets 21f7c99c25 group add_users spec 2013-06-26 15:32:09 +03:00
Dmitriy Zaporozhets a064060096 Test admin:group#index 2013-06-26 15:09:17 +03:00
Dmitriy Zaporozhets 112e919823 Remove unnecessary namespaced resource 2013-06-26 15:02:28 +03:00
Dmitriy Zaporozhets a5dbe35354 Improve change group ownership logic 2013-06-26 14:51:57 +03:00
Dmitriy Zaporozhets db03bfa868 Apply user project limit only for personal projects. We should not include group projects for user limit 2013-06-26 14:41:03 +03:00
Dmitriy Zaporozhets 579c0b9791 Merge pull request #4393 from dosire/scrum-improvements 
Rename unspecified to make it clearer and in line with scrum terminology
 2013-06-25 23:24:38 -07:00
Dmitriy Zaporozhets 743c232b16 Merge pull request #4412 from senny/fix_bad_constant_reference 
fix bad constant reference in `project_routing_spec.rb`.
 2013-06-25 22:57:33 -07:00
Yves Senn 95353aa6c4 Merge pull request #4419 from jlgeering/master 
whitespaces in gitlab.yml.example
 2013-06-25 22:55:13 -07:00
Dmitriy Zaporozhets f7199bb1fb Merge pull request #4361 from kenips/master 
Add missing assigned_to renaming to merge_requests_load_context
 2013-06-25 22:12:29 -07:00
Dmitriy Zaporozhets 0a0cdc6c61 Limit amount of contributors at graph to 100 persons 2013-06-25 17:34:50 +03:00
Dmitriy Zaporozhets 58427749fd Update repository head when change default project branch 2013-06-25 17:05:39 +03:00
Dmitriy Zaporozhets 0705a7a507 Changelog updated. Added migrate docs for 6.0 2013-06-25 16:49:27 +03:00
Dmitriy Zaporozhets d0529ad21d Fixed cache key difference for graph 2013-06-25 14:19:33 +03:00
Dmitriy Zaporozhets 11c9b06f7c Fix key observer spec 2013-06-25 14:12:38 +03:00
Jean-Luc Geering 01d694aaba whitespaces in gitlab.yml.example 2013-06-25 14:01:41 +03:00
Dmitriy Zaporozhets dc91755264 Cache graph log 2013-06-25 13:55:03 +03:00
Dmitriy Zaporozhets 367a5d1b32 remove text decoration for nav 2013-06-25 13:41:49 +03:00