home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,085 Commits 48 Branches 340 Tags
cab34dfbb2192e23dad9abc8091b00544496632c
Commit Graph
379 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 96a3f0e0a8 Fix rubocop issues 2015-02-04 18:26:41 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Valery Sizov b9d9ac82a9 Commit page: async load branches info 
Conflicts:
	config/routes.rb
 2015-02-03 09:10:56 -08:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Marin Jankovski 68f7302474 Add a scope for visible services, code styling changes for easier readability. 2015-01-28 14:25:55 -08:00
Marin Jankovski 537cd66d7e Add gitlab internal issue tracker service. 2015-01-28 09:28:17 -08:00
Marin Jankovski ededa98995 Shorter check in services controller. 2015-01-26 22:46:54 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets ed91378627 Fix blob controller rendering in case of errors 2015-01-26 15:12:13 -08:00
Dmitriy Zaporozhets 59b08942aa Refactor blob controllers 2015-01-26 15:02:28 -08:00
Dmitriy Zaporozhets c916124178 Explicitly set before_filter for ref-related controllers 2015-01-26 15:01:51 -08:00
Marin Jankovski 65e700472b Update the issue tracker attribute on issue tracker change. 2015-01-26 11:39:32 -08:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets 4225dad45e Merge branch 'ruby-19-hash' into 'master' 
Ruby 1.9 hash

See merge request !1430
 2015-01-24 05:06:12 +00:00
Dmitriy Zaporozhets a6bdf7d876 Show success/error message for test services button 2015-01-23 20:50:17 -08:00
Dmitriy Zaporozhets 3dfcb95f0d Use ruby 1.9 hash syntax 2015-01-23 17:41:10 -08:00
Marin Jankovski c70dcd2907 Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 2015-01-23 12:38:46 -08:00
Dmitriy Zaporozhets 2b10520b30 Merge pull request #7999 from cirosantilli/append-inplace 
Append in place for strings and arrays [failure unrelated]
 2015-01-21 23:07:15 -08:00
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
Dmitriy Zaporozhets 2395b8f079 Merge branch 'show_tags_in_commit_view' into 'master' 
Show tags in commit view

### What does this MR do?
With this MR you can see the assigned tags for a commit in the commit view.
### Are there points in the code the reviewer needs to double check?
I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb.
Then I can add a test for the new tag_names_contains method as soon as possible :)

### Why was this MR needed?
At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it.
Showing branch, tag details will give better overview about the commit

### What are the relevant issue numbers / Feature requests?
Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view
### Screenshots
![gitlab_feature_show_tags](https://gitlab.com/uploads/haynes/gitlab-ce/771c1a36bb/gitlab_feature_show_tags.png)

@dblessing Can you take a look at this MR as well please?

See merge request !297
 2015-01-21 18:23:46 +00:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Marin Jankovski 62c00661c4 Allow creation of the jira and redmine services. 2015-01-20 16:47:29 -08:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +01:00
Dmitriy Zaporozhets 7335dffbbc Fix conflict in merge request controller 2015-01-14 09:38:00 -08:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Dmitriy Zaporozhets bba8e59a04 Fix test hook and tests 2015-01-12 09:08:25 -08:00
Dmitriy Zaporozhets 3197044512 Refactor push data builder. Moved it to separate class 
Also execute GitLab CI on creating tag via UI
 2015-01-11 23:51:31 -08:00
Dmitriy Zaporozhets 9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -08:00
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Dmitriy Zaporozhets 4165426725 Restyle and refactor milestones filter 2015-01-06 12:32:04 -08:00
Ciro Santilli 33c9f05c6b Append in place for strings and arrays 2015-01-01 21:12:00 +01:00
Dmitriy Zaporozhets 15a0e1d6b9 Fix tests for share project with group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 12:48:29 +02:00
Dmitriy Zaporozhets 1abfc0730e Fix performance issue for "Share project with other groups" page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:49:53 +02:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity 
Teamcity integration using 8.1 rest api
 2014-12-28 22:11:29 +02:00
Marin Jankovski 16ebeedef2 Update branch status with ajax call. 2014-12-26 15:37:04 +01:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Marin Jankovski 92eb3974ac Add option to disable/enable developers push to already protected branches. 2014-12-26 11:39:12 +01:00
Marin Jankovski b7eb0d178e Add checkbox for protected branch developer can push to. 2014-12-26 09:14:53 +01:00
Dmitriy Zaporozhets 016981c009 Refactor issuable list pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:04:33 +02:00
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05:00
Dmitriy Zaporozhets 47634e392f Refactor issues and merge requests lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 18:49:39 +02:00
Dmitriy Zaporozhets dc0e6d06c5 Merge branch 'master' into ce-7-6 2014-12-16 13:21:18 +02:00
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +02:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00