home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dosire f909739f39 Split into one sentence per line for future edits. 2014-01-23 13:28:19 +01: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
Marin Jankovski 3bcfdf07cd Update last sha of the commit in the test seed repository. 2014-01-23 13:06:44 +01: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
dosire a91faf4022 Better ssh key docs. 2014-01-23 12:07:21 +01: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
dosire b057e58b6f Reword upgrade -y comment, improve layout and allow just y. 2014-01-23 11:44:53 +01:00
Jacob Vosmaer 9e6fc8b526 Report failure of DB backup commands 2014-01-23 11:19:43 +01:00
Marin Jankovski c6b9767e74 Test if the views behave correctly with reference style relative links. 2014-01-23 11:08:57 +01:00
Raffael Schmid 7863319b97 Merge branch 'master' into dont-depend-on-appid-and-appsecret 
* master: (238 commits)
  Version 6.5.1
  Fix selectbox when submit MR from fork to origin
  Fix HELP layout
  No need for code tag here.
  Spelling mistake and add links.
  Warn against RVM.
  Remove GitHub mention because we also have a GitLab issue tracker now.
  Replace 6.0-to-6.4.md with 6.0-to-6.5.md
  Add public assets to gitignore
  Version 6.5.0
  Use 6-5 branch in installation docs
  Remove deprecated twitter handle.
  Further explain userPrincipalName settings
  Update from 6.4 to 6.5 guide
  Explain how to use AD userPrincipalName for logins
  More entries to CHANGELOG. Version to rc1
  Rephrase LDAP check script output
  add O'Reilly sponsorship in CHANGELOG
  Fix select2 css for drop above style
  Rename "Website url" labels to "Website"
  ...
 2014-01-23 10:55:26 +01:00
Marin Jankovski 462161a3b0 Markdown helper spec for reference style relative links. 2014-01-23 10:43:04 +01:00
Marin Jankovski 5e08f8134e Replace context with service in development seed data. 2014-01-23 10:09:19 +01: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
dosire 03e0a759af Include a note for people that think the headers are wrong. 2014-01-23 08:57:28 +01: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
harsha 2b829aebc7 Correct section number for 'Check application status' 2014-01-22 19:31:48 +00: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
dosire 7ad70a56d3 Git over ssh and http are different things. 2014-01-22 17:51:00 +01: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 119c782e0b More explanation for upload limits. 2014-01-22 17:01:47 +01: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
Marin Jankovski 16ba8fa077 Display correct paths in markdown for reference style links. 2014-01-22 15:07:29 +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