home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,146 Commits 48 Branches 340 Tags
da255da8d6f348347382d04db220ea65a6cd6dff
Commit Graph
127 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
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
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 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 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
Marin Jankovski 54bcb6cc2a Merge branch 'master' into reference_relative_links 
Conflicts:
	spec/models/project_spec.rb
 2014-01-24 14:02:11 +01: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 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
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
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
Dmitriy Zaporozhets 1f43fa20d3 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:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
 2013-12-23 12:57:22 +02:00
Dmitriy Zaporozhets 68f8ffb551 Add spinach tests for email on push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:29:08 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard 
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
 2013-12-16 14:39:14 +01: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
Sytse Sijbrandij 7f3ff69e3e Merge pull request #5737 from Popl7/type_fix_for_project_network_graph 
type_fix_for_project_network_graph
 2013-12-01 03:10:16 -08:00
Steven Thonus e3d4eb2140 type_fix_for_project_network_graph 2013-11-30 17:27:02 +01:00
Dmitriy Zaporozhets db0c353a78 Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select 
Enable multiline select for blobs.
 2013-11-29 00:18:34 -08:00
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 10:01:43 +02:00
Jason Hollingsworth 568e05a73b Enable multiline select for blobs. 
Holding shift will allow users to click and select multiple lines.
The behavior is similar to GitHub.
Complete with tests.
 2013-11-27 20:08:37 -06:00
Sytse Sijbrandij ca1526e7ff Conventional naming for diff modes. 2013-11-27 09:00:14 +01:00
Dmitriy Zaporozhets b51c2c8118 Merge pull request #5308 from Popl7/parallel-diffs-side-by-side 
diff view on commit with parallel diff view
 2013-11-26 03:31:42 -08:00
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Steven ThonusandSteven Thonus 856d4088fb diff view on commit with parallel diff view 
TODO: fix comment forms to respect left and right columns
 2013-11-17 16:35:34 +01:00
Dmitriy Zaporozhets f2eb668348 Feature test for New file feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:45:23 +02:00
Johannes Schleifenbaum d9deb24f3a Preselect the current issue tracker with selected="selected" 
The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.
 2013-11-01 15:33:47 +01:00
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
Dmitriy Zaporozhets d65617aa47 Add feature test for project share 2013-10-16 14:17:58 +03:00
Marin Jankovski e649ea2fc5 Links in Readme in tree view. 2013-10-14 16:47:46 +02:00
Marin Jankovski ad3defa3c2 Skip relative links render in help page. 2013-10-11 21:41:33 +02:00