root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
7,994 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

7994 Commits

Author SHA1 Message Date
Дамјан Георгиевски be150fa991 Check specifically for Unicorn in rack config.ru file 
Don't assume that if the Rack server is not Passenger then it must be Unicorn. There are many other Rack servers in the world (uwsgi being one example that people use a lot).

The reverse check is much more logical, i.e. check explicitly for Unicorn
 2014-01-23 18:24:31 +01:00
Dmitriy Zaporozhets 6d3a92f225 Merge pull request #6131 from dblessing/fix/mobile_ui_login 
Enhance responsive UI for the login screen.
 2014-01-23 04:58:39 -08:00
Dmitriy Zaporozhets 28e13634dc
Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
Dmitriy Zaporozhets 573f1f4ade
Fix project model spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 14:23:21 +02:00
Dmitriy Zaporozhets 71851a7e4e
Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:31:16 +02:00
Dmitriy Zaporozhets e013cd44e0
Fix mr specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:24:25 +02:00
Dmitriy Zaporozhets 4cde3593b9
Fix satellites specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:21:58 +02:00
Dmitriy Zaporozhets 9db8cb3fec
fix tests notes_on_merge_requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:17:31 +02:00
Dmitriy Zaporozhets 418660b971
Fix public tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:05:34 +02:00
Dmitriy Zaporozhets c3270875ed
Fix project team tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:02:43 +02:00
Dmitriy Zaporozhets 380342784d
Fix MR spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 12:55:43 +02:00
Dmitriy Zaporozhets 68590fddd8
Version 6.5.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 10:13:23 +02:00
Dmitriy Zaporozhets ccae561f9b
Fix selectbox when submit MR from fork to origin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 10:08:26 +02:00
Dmitriy Zaporozhets 69ff7657d7
Fix HELP layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 09:23:58 +02:00
Drew Blessing 7c3a705365 Enhance responsive UI for the login screen. 2014-01-22 20:01:02 -06:00
Dmitriy Zaporozhets cee68dec8a
Fix api merge request specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 21:59:09 +02:00
Dmitriy Zaporozhets 4742dba4c5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-22 21:08:19 +02:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets c227aa44f9
Make changes to tests 
* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 21:03:52 +02:00
Dmitriy Zaporozhets 4b3afe2325
Always create merge_request_diff if MR created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 20:22:20 +02:00
Dmitriy Zaporozhets bf15b56a1e Merge branch 'warn-against-version-managers' into 'master' 
Warn Against Version Managers
 2014-01-22 16:49:17 +00:00
Dmitriy Zaporozhets 5745a5109f Merge branch 'ugly-reference' into 'master' 
Ugly Reference

This prevents it displaying as < code > on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md
 2014-01-22 16:48:46 +00:00
dosire 3ff27c4b1b No need for code tag here. 2014-01-22 17:46:40 +01:00
dosire a4f2da4763 Spelling mistake and add links. 2014-01-22 17:38:36 +01:00
dosire 3ba40f03ad Warn against RVM. 2014-01-22 17:37:01 +01:00
Dmitriy Zaporozhets 3fb22a1e51 Merge branch 'remove-github' into 'master' 
Remove github specific mention of issue tracker
 2014-01-22 16:18:24 +00:00
dosire efbb4fbb7a Remove GitHub mention because we also have a GitLab issue tracker now. 2014-01-22 16:54:53 +01:00
Dmitriy Zaporozhets 94865a607b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into improve/mr_diff 2014-01-22 17:16:01 +02:00
Sytse Sijbrandij dcc6ff5bcd Merge branch 'doc/6-0-to-6-5' into 'master' 
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
 2014-01-22 15:04:27 +00:00
Jacob Vosmaer 96ed6c4569 Replace 6.0-to-6.4.md with 6.0-to-6.5.md 2014-01-22 16:00:50 +01:00
Dmitriy Zaporozhets 51ea42e238
Improve commit render performnace for MR show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:54:53 +02:00
Dmitriy Zaporozhets 39a86963e9
Set mr_diff state to collected if diff is ok 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:30:14 +02:00
Dmitriy Zaporozhets 193a5ed3c3
Render MR diff correctly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:20:40 +02:00
Dmitriy Zaporozhets 79bfbe5918
Remove commits/diff store login from MergeRequest model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:20:20 +02:00
Dmitriy Zaporozhets d9be420ee6
MergeRequestDiff model responsoible for storing commits/diff info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:19:02 +02:00
Dmitriy Zaporozhets de724a7a34
Improve db schema for merge request diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:17:41 +02:00
Dmitriy Zaporozhets c983e8eb3d
Create separate table to store Merge request commits/diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 14:22:47 +02:00
Dmitriy Zaporozhets 1018cbdc80
Add public assets to gitignore 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 11:18:34 +02:00
Dmitriy Zaporozhets 51f06bad0b
Version 6.5.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 11:10:01 +02:00
Dmitriy Zaporozhets bcedc4858d
Use 6-5 branch in installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 11:08:42 +02:00
Dmitriy Zaporozhets 6c5606d212 Merge branch 'remove-old-twitter' into 'master' 
Remove Old Twitter
 2014-01-22 09:02:16 +00:00
dosire 604b38cd0a Remove deprecated twitter handle. 2014-01-22 10:00:25 +01:00
Dmitriy Zaporozhets d4e82f5e11 Merge pull request #6094 from sinm/patch-1 
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
 2014-01-22 00:19:05 -08:00
Sytse Sijbrandij a68630e06a Merge branch 'user_principal_name' into 'master' 
Explain how to use userPrincipalName as the username with AD
 2014-01-21 13:56:09 +00:00
Jacob Vosmaer 1ee9442323 Further explain userPrincipalName settings 2014-01-21 13:33:29 +01:00
Dmitriy Zaporozhets 9cc9e9cd9a
Update from 6.4 to 6.5 guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-21 13:30:33 +02:00
Jacob Vosmaer 7fe7897c56 Explain how to use AD userPrincipalName for logins 2014-01-21 12:25:12 +01:00
Dmitriy Zaporozhets 416c25871d
More entries to CHANGELOG. Version to rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-21 12:36:50 +02:00
Dmitriy Zaporozhets edd95a0e74 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-21 12:27:39 +02:00
Dmitriy Zaporozhets 5f9d90e218 Merge pull request #5958 from brunoga/go-repository-fetch 
Added support for Go's repository retrieval.
 2014-01-21 02:27:21 -08:00