home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,804 Commits 48 Branches 340 Tags
7cf86dc472702f58cf39ccdb0c22d97dbaba999d
Commit Graph
591 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 43217dd5dd Merge branch 'cirosantilli-factor-commit-msg-textarea' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
 2014-10-03 14:38:33 +03:00
Robert Schilling 77979280e0 Merge pull request #7947 from cirosantilli/rm-assign-without-effect 
Remove assignment without effect.
 2014-10-03 12:52:04 +02:00
Dmitriy Zaporozhets 4ebe718d69 Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/blob/_remove.html.haml
 2014-10-03 13:34:25 +03:00
Ciro Santilli 3960a5a25a Remove assignment without effect. 2014-10-03 12:19:31 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Robert Schilling 6f797f86de Merge pull request #7834 from cirosantilli/rm-empty-eq 
Remove test line without effect because no should.
 2014-10-03 07:48:22 +02:00
Dmitriy Zaporozhets c41805f60e Add test for broken admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:14:42 +03: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 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Robert Schilling 350877d050 Merge pull request #7904 from cirosantilli/titleize-actions 
Titleize blob action buttons. [failure unrelated]
 2014-10-01 17:58:28 +02:00
Ciro Santilli 64d7761e28 Move group feature step to match test location 2014-10-01 11:44:40 +02:00
Ciro Santilli 0d4ae0e392 Titleize blob action buttons. 2014-09-30 23:32:03 +02:00
Marin Jankovski 65cb51af31 Add a feature for readme on project show page. 2014-09-30 14:59:30 +02:00
Robert Schilling 5b5912f917 Merge pull request #7889 from cirosantilli/rm-def-project 
Remove def project from tests that inherit it.
 2014-09-30 07:42:30 +02:00
Dmitriy Zaporozhets 8163a43c8f Merge pull request #7862 from cirosantilli/test-change-file 
Add web UI file CRUD tests.
 2014-09-29 17:38:22 +03:00
Dmitriy Zaporozhets 83a21c33f1 Add tests for commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:11:53 +03:00
Ciro Santilli a92f48f615 Remove def project from tests that inherit it. 2014-09-28 13:44:04 +02:00
Ciro Santilli f456fce2a5 Add web UI file CRUD tests. 
me/ciro/bak/git/cirosantilli.com/web'
 2014-09-26 15:33:48 +02:00
Marin Jankovski 383825145f Add ability to remove the branded page logo. 2014-09-26 14:52:11 +02:00
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Robert Schilling b794fdbbbe Merge pull request #7838 from cirosantilli/evaluate-exec 
evaluate -> execute_script when return not needed.
 2014-09-24 10:28:15 +02:00
Ciro Santilli b9c2e6ebdc evaluate -> execute_script when return not needed. 2014-09-24 10:03:51 +02:00
Ciro Santilli 4e89860826 evaluate_script history -> go_back and go_forward. 2014-09-24 09:51:27 +02:00
Ciro Santilli 99bc22d7b4 Remove test line without effect because no should. 2014-09-23 23:55:23 +02:00
Robert Schilling 6da15541d3 Merge pull request #7833 from cirosantilli/wiki-cur-url 
Factor current_url + URI.path into current_path.
 2014-09-23 22:14:17 +02:00
Ciro Santilli b095c1a44e Factor current_url + URI.path into current_path. 2014-09-23 21:56:38 +02:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Dmitriy Zaporozhets c31c8c55a4 Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/markdown_render.rb
 2014-09-22 20:56:12 +03:00
Dmitriy Zaporozhets fbdf34d7ab Merge pull request #7821 from cirosantilli/factor-spinach-classes 
[factor] Prefix Spinach features with Spinach::Features::.
 2014-09-22 20:54:37 +03:00
Dmitriy Zaporozhets 8cd882355e Merge branch '7-4-pre' into 'master' 
7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096
 2014-09-22 17:25:49 +00:00
Ciro Santilli de6c8778f7 Prefix Spinach features with Spinach::Features::. 2014-09-22 16:30:25 +02:00
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Ciro Santilli ef6e94e37e Replace old spinach step definitions with step. 2014-09-22 10:01:50 +02:00
Ciro Santilli b65a2d07e4 Typo it -> its. 2014-09-21 19:45:54 +02:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-20 11:55:58 +03:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Dmitriy Zaporozhets 6dff16a679 Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:22 +03:00
Dmitriy Zaporozhets d771253bdb Fix README anchor tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-17 20:37:41 +03:00
Dmitriy Zaporozhets 4f1bb91a75 Fix finder and tests for new membership models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 16:45:28 +03: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
Dmitriy Zaporozhets ce49f035cf Fix access_level api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:55:36 +03:00
Dmitriy Zaporozhets 79190fe06b Merge branch 'implement_comments_on_parallel_diff' into 'master' 
Implement comments on parallel diff

Fixes #1565

See merge request !1090
 2014-09-15 07:19:50 +00:00
Marin Jankovski 75fbca83e3 Add one feature test. 2014-09-12 20:12:31 +02:00
Marin Jankovski 1fd58c84a0 Merge pull request #7741 from Razer6/refactor/remove_duplicate_steps 
[Refactor] Remove duplicated labels step
 2014-09-12 19:03:47 +02:00
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Robert Schilling 8321a4d41f Remove duplicated labels step 2014-09-12 07:22:30 +02:00
Dmitriy Zaporozhets 5913f74446 Clickable labels feature test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-11 14:31:19 +03:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00