home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,446 Commits 48 Branches 340 Tags
d9b5777db182ba3ee2341b19246feba86adb5708
Commit Graph
933 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets cb599a09be Allow close of broken MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 12:20:54 +02:00
Dmitriy Zaporozhets 6c3459978d Add new methods to MR to check if source or target branch exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:34:42 +02:00
Drew Blessing c26d392b1a Expire event cache on avatar creation/removal 2013-12-11 09:30:22 -06:00
Dmitriy Zaporozhets f088c867a4 Fix signup for rails4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:35:10 +02:00
Dmitriy Zaporozhets b3c1d0d8df Added allow_blank to model validations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 3b20c89005 Add visibility filter to Dashboard#projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-05 20:26:21 +02:00
Jason Hollingsworth c099074fcc Fix 404 on project page for unauthenticated user 
Eliminate a 404 error when user is not logged in and attempts to visit
a project page.

The 404 page will still show up when user is logged in and the project
doesn’t exist or the user doesn’t have access.
 2013-12-04 13:10:20 -06:00
Drew Blessing b08608b261 Issue 5716 - Allow removal of avatar 
Add class and style

Add spinach tests

Add entry to CHANGELOG

Add entry to CHANGELOG
 2013-12-02 16:20:34 -06:00
Dmitriy Zaporozhets 4f32d2e28e Remove GET .js format for Milestone controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 14:32:54 +02:00
Dmitriy Zaporozhets e3464a54d8 Remove .js format for MergeRequest controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 14:27:36 +02:00
Dmitriy Zaporozhets da10cad1da Drop rjs from Issues#index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 15:05:32 +02:00
Dmitriy Zaporozhets 596e64e5d7 Drop rjs from Notes#index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 14:46:40 +02:00
Dmitriy Zaporozhets 33aea41708 Drop rjs from Infinite scrolling 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-28 11:38:20 +02:00
Dmitriy Zaporozhets fa7d62494a Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects 
Conflicts:
	app/models/project.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 11:51:46 +02:00
Dmitriy Zaporozhets b2e4664cc7 Read-only email field for LDAP user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 10:32:37 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Jason Blanchard b76948e6c9 Added sorting to project issues page 2013-11-23 15:04:50 -05:00
Dmitriy Zaporozhets b07c02eb13 Add more info to admin dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 13:41:41 +02:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets bd20ec1a34 Remove file from repository feature 
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:14:56 +02:00
Dmitriy Zaporozhets 0815098d3a Admin can transfer project to any namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-15 15:25:37 +02:00
Dmitriy Zaporozhets 13a6604030 Ability to remvoe broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 15:20:31 +02:00
Dmitriy Zaporozhets dd501aa7a7 Broadcast messages scaffold in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 14:28:12 +02:00
Dmitriy Zaporozhets 02484930e1 Removed Project#discover_default_branch since it not needed any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 09:22:50 +02:00
Dmitriy Zaporozhets d78b6ce4cc New feature: Ability to leave project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 16:41:29 +02:00
Dmitriy Zaporozhets 160bd862be Refactoring for EditTree and NewTree controllers and contexts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:21:11 +02:00
Dmitriy Zaporozhets f61850e6e3 Move part of file creation logic into separate context 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:06:52 +02:00
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI 
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:28:49 +02:00
Jason Hollingsworth dfe19b2b84 Fixes 500 error when user types in wrong group name. 2013-11-01 11:29:37 -05:00
Johannes Schleifenbaum cc505f550d Check if a file is editied "on" a branch or a commit. 
The previous behavior was a "disabled" link, which was still clickable
and linked to the edit file action.

If the 	user accesses a path like "/edit/master/README" show the file
edit form (just like before).

If the user accesses a path like
"/edit/8d5c1f375ce99e5df84e26b0eafbf1448c6a001e/README", redirect the
user to the file detail page with a note, that he cannot edit a file
"on" a commit.

fixes #5482
 2013-10-30 11:34:26 +01:00
arul 0f3ef9bed2 Fix for issue #5431 2013-10-24 19:27:23 +02:00
Dmitriy Zaporozhets 88519e9033 Refactor and restyle Admin#background_jobs page 2013-10-23 10:11:54 +03:00
Andrey Kumanyaev 6173d0a92f Show branches list (which branches contains commit) on commit page 2013-10-21 22:54:37 +04:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Dmitriy Zaporozhets 01186f9fc6 Show confirmation status in profile 2013-10-15 11:19:19 +03:00
Dmitriy Zaporozhets 2e8b0fa5cf Oauth users and users created by admin should be confirmed immediatly 2013-10-15 09:59:58 +03:00
Dmitriy Zaporozhets 3cbfb1ee7c Remove .git from project url end redirect 
Ex. redirect from
  localhost/group/project.git
to
  localhost/group/project

It used to prevent 404 error when follow submodule http link
like http://localhost/group/project.git
 2013-10-14 13:27:39 +03:00
Dmitriy Zaporozhets e50c0d5cb7 Fix spinach profile tests 2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets 4c8224ae1e Move profile account to separate controller 2013-10-09 16:43:17 +03:00
Dmitriy Zaporozhets c41e66db52 Separate page for password change 2013-10-09 16:43:11 +03:00
Dmitriy Zaporozhets 2eb76186f5 Merge pull request #5158 from tkoenig/fix-active-milestone-order 
Sort active milestones by due date (upcoming first)
 2013-10-07 03:35:09 -07:00
Dmitriy Zaporozhets 970d86b7c5 Refactor blob finding 2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets 836c870cc9 Fix edit file 2013-10-01 17:08:40 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 052a7cc9cd Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
 2013-09-26 22:19:01 +03:00
Dmitriy Zaporozhets 5e843a1769 Explain on dashboard that limit amount of projects displayed 2013-09-26 19:46:31 +03:00
Dmitriy Zaporozhets 65b9768ccf Group ownership completely based on users_groups relation now 
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
 2013-09-26 14:49:22 +03:00
Dmitriy Zaporozhets 3cb663f5c9 Remove project transfer page since we already have multiple owners for group 2013-09-26 10:33:06 +03:00