home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 13:06:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,146 Commits 48 Branches 340 Tags
da255da8d6f348347382d04db220ea65a6cd6dff
Commit Graph
216 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
 2014-03-21 12:22:43 +02:00
Robert Speicher 1897fb00b8 Make use of project factory traits 2014-03-19 05:15:24 -04:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
 2014-03-18 11:15:01 +02:00
Marin Jankovski 3f818a3d58 Update wiki tests. 2014-03-17 13:06:27 +01:00
Dmitriy Zaporozhets b007cadf55 Fix project creation test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:19:02 +02:00
Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
 2014-03-13 23:11:16 +02:00
Dmitriy Zaporozhets c8e1c53f43 Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix 2014-03-13 22:36:39 +02:00
Dmitriy Zaporozhets fe8552eff6 Add tests to reopen MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-03 10:21:50 +02:00
Dmitriy Zaporozhets 1ff1b6d816 Merge pull request #5719 from jacob-carlborg/mr_target 
By default, target original repository if it's a fork when creating new MR.
 2014-02-26 12:33:48 +02:00
Dmitriy Zaporozhets 9f20580ed7 Merge pull request #6375 from cirosantilli/link-with-id 
Blob and tree gfm links to anchors work.
 2014-02-25 10:58:24 +02:00
Dmitriy Zaporozhets 56d67dc228 Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
 2014-02-25 10:24:40 +02:00
Dmitriy Zaporozhets 720babec07 Fixed 500 error on branch and tag creation via UI 
Also fixes issue with branch/tag removing via UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 09:35:09 +02:00
Jacob CarlborgandJacob Carlborg 9439cb5526 By default, target original repository if fork when creating new MR. 2014-02-24 22:06:25 +01:00
Dmitriy Zaporozhets 31386adf53 Fixed 500 error on branch and tag creation via UI 
Also fixes issue with branch/tag removing via UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 14:55:27 +02:00
Ciro Santillli 170340e6b1 Remove dir prefix and suffix from tests inside dir. 2014-02-23 10:34:39 +01:00
Ciro Santillli 90bdcac6b1 Blob and tree gfm links to anchors work. 
Fixes #6046
 2014-02-23 09:47:52 +01:00
Jacob CarlborgandJacob Carlborg 2d554f42f0 Add button for toggling inline comments in diff view. 
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
 2014-02-22 21:21:12 +01:00
Dmitriy Zaporozhets cf413ffb75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	db/schema.rb
	features/steps/group/group.rb
	lib/api/internal.rb
 2014-02-19 14:55:07 +02:00
Dmitriy Zaporozhets ee75029867 Move assignee/milestone below description of Issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 09:38:01 +02:00
Dmitriy Zaporozhets a718a9af3e Restyle labels filter to match common style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 20:48:02 +02:00
Dmitriy Zaporozhets 25741c97a2 Merge pull request #6350 from tudorpavel/filter-by-multiple-labels 
Add feature to filter issues by multiple labels
 2014-02-18 20:32:04 +02:00
Dmitriy Zaporozhets 555c25e601 Fix random failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 17:34:22 +02:00
Tudor Pavel 4f6b570fbe Filter issues by multiple labels with Spinach feature spec 2014-02-18 15:38:33 +02:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users 
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
 2014-02-13 22:59:39 -06:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
Ciro Santillli 61748c993d Headers have ids and link to their own id. 2014-02-11 16:23:33 +01:00
Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
 2014-02-11 10:15:13 +02:00
Dmitriy Zaporozhets 0a3d50eb32 Fixed tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 16:17:33 +02:00
Marin Jankovski 54bcb6cc2a Merge branch 'master' into reference_relative_links 
Conflicts:
	spec/models/project_spec.rb
 2014-01-24 14:02:11 +01:00
Marin Jankovski d819d0d1f8 Use the correct paths. 2014-01-23 16:00:39 +01: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 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
Marin Jankovski c6b9767e74 Test if the views behave correctly with reference style relative links. 2014-01-23 11:08:57 +01: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 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
 2014-01-21 18:15:49 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 4e2c34d81b Test hook properly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:38:48 +02:00
Dmitriy Zaporozhets 9247490109 Tests for accept MR with custom message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 11:49:54 +02:00
Jeroen van Baarsen 2eb1220f67 Removed expiration from snippets 
* Removed the expiration from the project snippets
* Fixed the layout for the project snippets
 2014-01-11 18:24:20 +01:00
Dmitriy Zaporozhets 04ad19dc5c Include missing helper for project_forked_merge_requests tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 16:05:41 +02:00
Dmitriy Zaporozhets 54b908afb7 Remove include of un-existing helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:45:29 +02:00
Dmitriy Zaporozhets 047a76009a Remove chosen from tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:35:39 +02:00
Dmitriy Zaporozhets ac6c050773 Fix network tests. Removed console.log 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-05 13:41:09 +02:00
Dmitriy Zaporozhets a81002d920 Fix wiki tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-02 13:11:52 +02:00
Dmitriy Zaporozhets 21b028b548 Improve tests and make preview for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 23:21:26 +02:00
Dmitriy Zaporozhets d663e8958a Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
 2013-12-23 16:43:56 +02:00
Dmitriy Zaporozhets cc51931d1f Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 14:21:02 +02:00
Dmitriy Zaporozhets b8b8a34b52 Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 13:19:13 +02:00