home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,024 Commits 48 Branches 340 Tags
cd3fb5ff75c09ca2cb1b54f48349a8959bc8d585
Commit Graph
494 Commits
Author SHA1 Message Date
Marin Jankovski 5e89354fe6 Fix for test with new form of MR. 2014-05-15 13:39:27 +02:00
Marin Jankovski 9ff69c4c4b Add tests for template mr description. 2014-05-14 15:24:14 +02:00
Marin Jankovski e2d4ee91bd Add tests and documentation for jira service. 2014-05-13 13:48:55 +02:00
Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03:00
Dmitriy Zaporozhets 41231862ba Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 19:23:39 +03:00
Dmitriy Zaporozhets 536373ad05 Dont allow mr compare with empty branches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 19:00:03 +03:00
Dmitriy Zaporozhets 86bf684f5d Minor UI improvements and fixed test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 16:30:39 +03:00
Marin Jankovski 99e0d0dd6f Unstub after the test is done. 2014-05-07 11:52:07 +02:00
Dmitriy Zaporozhets e640481625 Merge branch 'files_in_wiki' into 'master' 
Add support to show files from wiki repository on wiki pages
 2014-05-06 10:21:05 +00:00
Marin Jankovski 00cd3ecc44 Use stub in testing. 2014-05-06 09:57:08 +02:00
Marin Jankovski 5a949e6095 Add tests for wiki files showing. 2014-05-05 13:47:47 +02:00
Dmitriy Zaporozhets c4e713a5b6 Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee 
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
 2014-04-22 11:58:11 +02:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Dmitriy Zaporozhets a7680d7e3a Spinach feature for appearance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:51 +03:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Hiroyuki Sato bca528a57c Better title format for wiki page 
The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
 2014-04-10 15:14:02 +09:00
Dmitriy Zaporozhets fae6eb6353 Merge branch 'wiki-refactoring' into 'master' 
Wiki refactoring

Better names for variables and classes
 2014-04-09 17:48:46 +00:00
Dmitriy Zaporozhets 1bd28994cc Use ProjectWiki instead of GollumWiki in code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:58 +03:00
Marin Jankovski e617cf95d4 Add issue to an empty repo, test. 2014-04-08 17:12:57 +02:00
Dmitriy Zaporozhets 9b598fa62d Fix MR fork validation and services load 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 10:36:10 +03:00
Dmitriy Zaporozhets 7847e10863 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 12:05:37 +02:00
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 822be2c782 Add tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-18 12:54:40 +02: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
Matt DeTullio 5d6d795d60 Fixes a bug with group member administration 
Group owners were not able to remove any users from their group if they were the only owner.
 2014-03-10 22:56:26 -04: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 a02c1fd390 Remove js tag for constantly failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 21:08:02 +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 4401382798 Fix 500 error when try to update own profile in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 10:15:43 +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 79dd7beebd Merge branch 'feature/public_groups' into 'master' 
Public Groups

This is the initial work (meaning no tests) for making groups public if they have a public project (or internal for logged in users). This allows issues and merge requests to be viewed, but _not_ group membership. As part of this I have also added back the link in the public project title section (it was removed as it didn't make sense before).

This addesses the following suggestions/issues:

http://feedback.gitlab.com/forums/176466-general/suggestions/5314461-groups-containing-one-or-more-public-projects-shou
Issue #32
https://github.com/gitlabhq/gitlabhq/issues/5203
as well as a few closed issues.

This also changes the public user page to only show groups that are accessible to the user in some manner.
 2014-02-24 19:37:13 +00: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
Dmitriy Zaporozhets 6c8a17d06d Fix diff tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 12:17:39 +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
Jason Hollingsworth 2f69213e3f Allow access to groups with public projects. 
Fixed Group avatars to only display when user has read
permissions to at least one project in the group.
 2014-02-20 09:26:38 -06: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