home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,161 Commits 48 Branches 340 Tags
4e8cc3e19f7c13435c360e7ccaaa9cc860cbff34
Commit Graph
611 Commits
Author SHA1 Message Date
Valery Sizov 91402ac0eb Merge branch '7-4-stable' into ee_stable 2014-10-21 13:48:16 +03:00
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03:00
Valery Sizov e769822595 Merge branch '7-4-stable' into to_ee_stable_from_ce_stable 
Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb
 2014-10-20 19:59:36 +03:00
Dmitriy Zaporozhets 644fd232db Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03: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
Dmitriy Zaporozhets e261de255d Merge pull request #7942 from cirosantilli/commit-changes-uppercase 
Make new and edit file submit more uniform
 2014-10-13 18:47:46 +03:00
Dmitriy Zaporozhets b2d1e97df9 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 18:42:05 +03:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:39:48 +03:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets cf1aa36a21 Merge pull request #7979 from mr-vinn/refactor-tasks 
Refactor task list tests and coffeescript
 2014-10-08 11:37:21 +03:00
Ciro Santilli 166c215a75 Make new and edit file submit more uniform 2014-10-08 10:01:07 +02:00
Valery Sizov fd8d1d9b62 Snippets: rename public to internal 2014-10-07 11:54:00 +03:00
Vinnie Okada 40263a06c1 Refactor task list tests and coffeescript 2014-10-06 19:19:12 -05:00
Dmitriy Zaporozhets 70004f4ef6 Merge branch 'slack_integration' into 'master' 
Slack integration

See merge request !1151
 2014-10-06 16:14:48 +00:00
Marin Jankovski 0fed1b5876 Merge pull request #7964 from mr-vinn/task-lists 
Add task lists to issues and merge requests
 2014-10-06 17:29:06 +02:00
Marin Jankovski 9535ce2caa Preventing some duplication in MR feature tests by adding a different comment. 2014-10-06 16:09:22 +02:00
Marin Jankovski 2017977214 Use only webhook for slack service integration. 2014-10-06 10:44:01 +02:00
Vinnie Okada 31bc42de57 Add Spinach tests for task lists 2014-10-06 02:07:03 -05:00
Ciro Santilli fa34901237 Make Spinach test names consistent 
- do not add Feature to feature titles
- titleize feature titles
- put steps on the same path as .feature files
- make feature titles match their path
 2014-10-05 18:21:11 +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 d1fa3b336d Add Pushover service integration 
That introduce select field type for services options.
 2014-10-03 13:54:37 +02: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