home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,520 Commits 48 Branches 340 Tags
f1fd47875c19bf4bd9b5bbd2975f99209f1c282e
Commit Graph
3620 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f1fd47875c Merge branch 'epic/public_projects' of /home/git/repositories/gitlab/gitlabhq 2013-09-25 13:25:47 +00:00
Dmitriy Zaporozhets 573d367be5 Modify permissions for project and group 
* Hooks and team pages allowed only for masters/owners
* Group page allowed for admin
* Corrent authentication for Projects controller
* Hide some project elements from visitor
 2013-09-25 14:05:35 +03:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2 
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
 2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 61eb050993 Different layout for browsing public area and public project page while not logged-in 2013-09-24 22:14:03 +03:00
Dmitriy Zaporozhets d90462033e Remove writing issues/notes from non-auth user abilities 2013-09-24 22:13:28 +03:00
Dmitriy Zaporozhets 09cb2ba815 Fix password update 2013-09-24 22:12:48 +03:00
Dmitriy Zaporozhets ffd0a985ee Point to project page from public area 2013-09-24 16:00:21 +03:00
Dmitriy Zaporozhets 66998f6d46 Allow non authenticated user access to public projects 2013-09-24 15:58:39 +03:00
Dmitriy Zaporozhets 0009016b68 Fix commits table highlight 2013-09-24 11:50:37 +00:00
Dmitriy Zaporozhets e894e3eea5 Restyle sign-in page. Mention public projects 2013-09-24 12:27:25 +03:00
Dmitriy Zaporozhets 9587506124 Dont override default table with bootstrap class. Refactor table css 2013-09-24 12:08:28 +03:00
Dmitriy Zaporozhets 642398285d Force user to provide old password in order to change it 2013-09-24 10:48:36 +03:00
Dmitriy Zaporozhets 7be084b13a Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projects 
Prevent empty public projects from throwing exceptions
 2013-09-22 02:21:33 -07:00
Dmitriy Zaporozhets 5bc07b2ad8 Merge pull request #5116 from karlhungus/feature-configurable-theme 
Make users theme configurable
 2013-09-22 02:20:26 -07:00
Dmitriy Zaporozhets 8fb83bc81e Fix hover for tree view 2013-09-22 08:48:04 +00:00
Izaak Alpert 51e6095dd1 Make users theme configurable 
GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
 2013-09-22 01:05:14 -04:00
Sytse Sijbrandij 5367e42bd6 Restyle event title 2013-09-21 20:59:46 +02:00
Sytse Sijbrandij 1a5cde17ac Restyle tree table UI 2013-09-21 20:34:14 +02:00
Izaak Alpert 61a86101e8 Prevent empty public projects from throwing exceptions 
GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
 2013-09-20 11:42:38 -04:00
Dmitriy Zaporozhets 8672203baf Merge pull request #5112 from hiroponz/drop-support-of-root-namespace 
Drop support of root namespace in model
 2013-09-17 23:57:17 -07:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Dmitriy Zaporozhets 9c629a1ebc Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare 2013-09-16 13:33:34 +03:00
Dmitriy Zaporozhets 90dc5ff5fd Fix 500 error on admin->project page 2013-09-14 21:18:01 +03:00
Dmitriy Zaporozhets 74a621385f Extend user infiormation displayed on admin user page 2013-09-14 20:55:33 +03:00
Dmitriy Zaporozhets a51562d6d9 Fix setting default values for user 2013-09-14 20:51:16 +03:00
Dmitriy Zaporozhets df92d4ff67 Merge pull request #5072 from jbornschein/proj-new-public 
Add "public-project?" checkbox to new-project view
 2013-09-14 06:19:56 -07:00
Joerg Bornschein c71460d2d3 Use ruby 1.9 hash syntax 2013-09-14 13:28:15 +02:00
Dmitriy Zaporozhets c479b1dd1f Merge pull request #5051 from jbornschein/patch-1 
Minor UI fix in views/public/project/index.html.haml
 2013-09-14 00:17:24 -07:00
Dmitriy Zaporozhets 6df16564ef Merge pull request #5076 from jzi/notify_commit_author 
Re-enable notifying commit authors of new commit notes
 2013-09-14 00:06:43 -07:00
Jakub Zienkiewicz 49f609a936 notify commit author of new notes 2013-09-13 15:38:37 +02:00
Joerg Bornschein 83b212a4ef Add public-project? checkbox to new-project view 2013-09-13 14:39:04 +02:00
Joerg Bornschein 8199be83f5 Fix default settings when creating new Project 2013-09-13 13:02:37 +02:00
Marin Jankovski 91e112ffe2 Replace remote url on selection. 2013-09-13 10:12:42 +02:00
Dmitriy Zaporozhets e1ca9de0da Add default values to compare page link 2013-09-12 21:46:31 +03:00
Dmitriy Zaporozhets 839c3b198e Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 18:40:41 +00:00
Dmitriy Zaporozhets 069a6dfa91 Compare link for branches 2013-09-12 21:39:53 +03:00
Dmitriy Zaporozhets ed72e949f2 Right branches for mr link at Compare view 2013-09-12 20:23:03 +03:00
Dmitriy Zaporozhets f774949d3f Compare page improved 
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
 2013-09-12 20:15:10 +03:00
Dmitriy Zaporozhets c1dd31cf8b Enable UsersGroup observer, Add group_member methods to NotificationService 2013-09-12 19:00:32 +03:00
Dmitriy Zaporozhets 8589824f00 Add UsersGroup observer 
Trigger notification service when new user-group relation was created
 2013-09-12 18:59:31 +03:00
Dmitriy Zaporozhets edb3368c93 Merge pull request #5048 from Nullreff/image-diff 
Fix bug with rendering changing images in commits
 2013-09-12 07:05:16 -07:00
Dmitriy Zaporozhets 4f9bc937b3 Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 14:01:21 +00:00
Jörg Bornschein 811622346b Minor UI change in iews/public/project/index.html.haml 
Placeholder in search field was wrong
 2013-09-12 13:33:09 +02:00
Ryan Mendivil 0a05ab9126 Fix bug with rendering changing images in commits 
When viewing the diff for a changed image file, two bugs occur:

- Both the 'before' and 'after' images link to the 'after' commit
- Visiting the link for either image will cause a error

The first is caused by both image links referencing '@commit.id' rather
than '@commit.parent_id'.  The second is caused by the use of
'project_tree_path' which is used for creating links to directories in
the git file tree. 'project_blob_path' which links to files should be
used instead.
 2013-09-11 18:53:37 -08:00
Dmitriy Zaporozhets 13fec18ac9 Truncate some text from dashboard events 2013-09-11 22:46:37 +03:00
Dmitriy Zaporozhets 4002561e17 New landing page when you have 0 projects 2013-09-11 22:20:51 +03:00
Izaak Alpert 88d4559e62 Removed private scope 
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
 2013-09-11 14:32:24 -04:00
Dmitriy Zaporozhets 73446fe15e Email templates when user was added to group 2013-09-11 21:17:28 +03:00
Izaak Alpert 810851f574 Style updates 
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
 2013-09-11 14:04:15 -04:00