home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
551 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Dmitriy Zaporozhets 2d6c4d2bb0 Merge branch 'fix-huge-mr' into 'master' 
Fix huge merge requests

* Refactored suppress logic for diffs
* Increase grit memory limit (should mix most of 502 errors when create MR)
* show first 100 files for huge diffs

Fixes #1424

See merge request !970
 2014-07-15 17:28:03 +00:00
Dmitriy Zaporozhets 1d5965267b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 19:42:51 +03:00
Marin Jankovski b916bf4368 Fix test for no milestone description. 2014-07-15 12:27:29 +02:00
Marin Jankovski c68e3f77ad Render images in help pages. 2014-07-15 11:28:46 +02:00
Marin Jankovski 3b80d68f9d Add in the tests. 2014-07-11 19:53:10 +02:00
Marin Jankovski 55efb2d9f2 Revert "Merge branch 'redirect_after_login' into 'master'" 
This reverts commit 5aaa35656e, reversing
changes made to 5b8c176767.
 2014-07-11 19:53:10 +02:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Marin Jankovski 4a505f38ac Update the tests with milestones descriptions. 2014-07-10 08:46:52 +02:00
Marin Jankovski 91e01275cb Add tests to check for correct browse link name. 2014-07-09 10:12:09 +02:00
Dmitriy Zaporozhets 8fb76a8308 Merge branch 'group_milestones' into 'master' 
Group milestones
 2014-07-01 07:18:15 +00:00
Dmitriy Zaporozhets bcfcd243a6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-30 20:06:23 +03:00
Marin Jankovski 3e52517da1 Add feature tests for group milestone. 2014-06-30 16:18:26 +02:00
Sytse Sijbrandij 2f962a40e8 Merge pull request #7170 from cirosantilli/add-trailing-newlines 
[minor-refactor] Add trailing newline to all text files.
 2014-06-30 09:41:06 +02:00
Dmitriy Zaporozhets ab29ddcfc4 Enable snippets for test project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-27 00:01:16 +03:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets 1e3c9eb450 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 12:05:06 +03:00
Dmitriy Zaporozhets ba7b4630a2 Replace home icon with tab names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:39:35 +03:00
Dmitriy Zaporozhets af7e77984c Show VERSION information on project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 12:07:06 +03:00
Dmitriy Zaporozhets 674cbe1534 Fix diff comments toggle button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 11:40:33 +03:00
Dmitriy Zaporozhets 075905ffe8 Fix some MR commenting tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:48:21 +03:00
Dmitriy Zaporozhets 69baa3afb2 Dont render difscussion for commit diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 20:22:33 +03:00
Marin Jankovski d12c1e90f8 Test secondary user email removal. 2014-06-23 10:39:56 +02:00
Dmitriy Zaporozhets 5aaa35656e Merge branch 'redirect_after_login' into 'master' 
Redirect after login
 2014-06-23 06:38:24 +00:00
Ciro Santilli a7e0ca9e83 Add trailing newline to all text files. 
Present in the large majority of files of each respective type.
 2014-06-21 11:20:22 +02:00
Marin Jankovski 93bef4f04a Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
 2014-06-20 13:27:27 +02:00
Marin Jankovski db88797ef9 Fix test 2014-06-19 16:51:36 +02:00
Marin Jankovski 26d1bd7c2a Set return url as param. 2014-06-19 14:20:25 +02:00
Dmitriy Zaporozhets f3369e3a00 Fix project trasnfer for admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-19 13:20:42 +03:00
Marin Jankovski 2c3626884e Test the redirect after sign in. 2014-06-19 11:24:59 +02:00
Dmitriy Zaporozhets 30654f8d83 remove duplicate steps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 12:14:17 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets 869809a1cf Remove failing test on travis+pg 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:41:32 +03:00
Dmitriy Zaporozhets 9be5425a88 Refactor snippets views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:36:46 +03:00
Dmitriy Zaporozhets d593c98fcb Delete wall notes tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:29:26 +03:00
Dmitriy Zaporozhets 11728851bf Fix blob highlight tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:36:38 +03:00
Dmitriy Zaporozhets 67ba36ebac Revert "Revert "Fix for failing specs"" 
This reverts commit 2545b0f858.
 2014-06-06 09:01:17 +03:00
Dmitriy Zaporozhets db779388fe Merge pull request #7075 from jvanbaarsen/split-spinach-tests 
Splitted the Spinach tests to prevent time-outs
 2014-06-05 21:56:48 +03:00
Dmitriy Zaporozhets 08c3c0659c Merge pull request #7086 from jvanbaarsen/revert-rspec-fix 
Revert "Fix for failing specs"
 2014-06-05 21:45:35 +03:00
Jeroen van Baarsen 2545b0f858 Revert "Fix for failing specs" 
This reverts commit 2314438925.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
 2014-06-05 20:21:28 +02:00
Jeroen van Baarsen e84057da1b Splitted the Spinach tests to prevent time-outs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-04 22:55:27 +02:00
Dmitriy Zaporozhets eeef2c7350 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 20:39:43 +03:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Dmitriy Zaporozhets a54bef0a42 Merge pull request #6943 from jvanbaarsen/spec-fix 
Fix for failing specs
 2014-06-03 09:13:33 +03:00
Dmitriy Zaporozhets e9de569458 Fix tests for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 13:43:07 +03:00
Jeroen van Baarsen 2314438925 Fix for failing specs 2014-05-30 23:19:50 +02:00
Dmitriy Zaporozhets e6f1eef478 Fix group tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 21:30:07 +03:00
Marin Jankovski 0879babfd1 Fix feature. 2014-05-29 10:13:30 +02:00
Marin Jankovski f79a300417 Replace existing links to help pages with the new ones. 2014-05-29 08:58:15 +02:00
Marin Jankovski 281643a1bf Add feature spec. 2014-05-26 20:43:58 +02:00