home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
162 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Carlos Ribeiro 714ef62264 Fix the email variable substituation in ssh help page 2015-01-15 23:06:32 -02:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Ciro Santilli 6aa0448f76 Remove trailing whitespace from views. 2014-09-30 16:41:48 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Robert Schilling 7f7bf86bbf Change shortcut for activity to project, because navbar changed 2014-09-08 20:49:15 +02:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +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
Dmitriy Zaporozhets a5379ef9f7 Cleaner help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 10:24:57 +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 56cb6d8899 Fix help css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:58:54 +03:00
Dmitriy Zaporozhets 6a7990c007 Remove garbage and apply wiki style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 15:51:07 +03:00
Dmitriy Zaporozhets 248a3e5688 Fix help page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 09:39:03 +03:00
Dmitriy Zaporozhets 38ff5d1ab9 Replace ui-box title with panel-heading 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 18:43:21 +03:00
Dmitriy Zaporozhets 6dcbe1b43c Replace ui-box with panel.panel-default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 18:42:44 +03:00
Marin Jankovski a9580a157a Use the correct links, replace in search. 2014-05-29 08:44:25 +02:00
Marin Jankovski 59797b2f2e Remove list items styling in show render. 2014-05-29 08:44:25 +02:00
Marin Jankovski 54ff9d90ad Scan the text and add the help path. 2014-05-29 08:44:25 +02:00
Job van der VoortandMarin Jankovski fd476cf620 render items from doc 2014-05-29 08:44:25 +02:00
Job van der VoortandMarin Jankovski e61e3eaadb render readme in help 2014-05-29 08:44:25 +02:00
Dmitriy Zaporozhets bbc4b2be8d Fix help tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 14:26:15 +03: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
dosire c5bbb15d0c 100k organizations use GitLab. 2014-04-14 13:50:31 +02:00
Olle Kelderman ca6978dfc5 Replace $your_email with actual email-address. Fixes #6714 2014-04-14 05:00:48 +02: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
dosire 6205b068cd Reduce the number of times people send emails or file issues out of the blue. 2014-04-04 08:05:09 +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
Jeroen van Baarsen 564c37d9b6 Moved all the help files to markdown files: 
Files moved:
* Workflow
* help/ssh
* help/webhooks
* help/system_hooks
* help/public_access
* help/permissions
 2014-02-28 19:30:13 +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 6cf39fe10d Extract commits API to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:41:21 +02:00
Dmitriy Zaporozhets ddbe978041 Complete api files CRUD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:27:02 +02:00
Jacob Vosmaer cf9c8e7382 Explanation MR workflow and authorization 2014-02-13 14:25:43 +01:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
Dmitriy Zaporozhets c61512d4e1 Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into cirosantilli-header-anchors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-02-11 20:32:21 +02:00
Ciro Santillli 61748c993d Headers have ids and link to their own id. 2014-02-11 16:23:33 +01:00
Ciro Santillli 91571c078d User pages are visible to users without login 
... if the user is authorized to at least one public project.
 2014-02-11 15:45:30 +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
dosire 7b33efdf5e More than text was missing a word on the help page. 2014-02-10 11:44:27 +01:00
dosire ea10424e0e Also change the description in the help. 2014-02-07 17:06:32 +01:00
Dmitriy Zaporozhets 4645f464a3 Allow developers to mange issue tracker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:22 +02:00
dosire f909739f39 Split into one sentence per line for future edits. 2014-01-23 13:28:19 +01:00
dosire a91faf4022 Better ssh key docs. 2014-01-23 12:07:21 +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
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
Jeroen van Baarsen ef7fce4a9f Fixed modal so it can be closed with ESC 
* Fixes: #5343
 2014-01-09 17:04:46 +01:00
Dmitriy Zaporozhets 779355ae8e Merge branch 'dogfood' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/update/6.0-to-6.4.md
 2014-01-03 22:58:48 +02:00