home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,128 Commits 48 Branches 340 Tags
0852d5e480e2789dcc6b5cce08fc0875f97af4bf
Commit Graph
12128 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 0852d5e480 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:36:06 +03:00
Dmitriy Zaporozhets ea04ed7879 Use 8chars short sha for commit in views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:30:14 +03:00
Dmitriy Zaporozhets daa55f31d8 Dont raise exception when wrong commit id passed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:58:11 +03:00
Dmitriy Zaporozhets 200118357d Use full commit sha width for reference in note body to prevent Ambiguous SHA1 prefix problem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:44:27 +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
Dmitriy Zaporozhets 9c824888c8 Merge branch 'ssl_ciphers' into 'master' 
Ssl ciphers update

See merge request !1168
 2014-10-10 09:49:00 +00:00
Marin Jankovski be14c7a83f Add a comment on why we are using backward compatible ciphers. 2014-10-10 09:44:08 +02:00
Marin Jankovski 8ddb2be69a Revert "update ssl_ciphers" 
This reverts commit c41e5f5018.
 2014-10-10 09:38:39 +02:00
Marin Jankovski 488081cdea Merge pull request #8004 from mr-vinn/rm-task-method 
Remove unused method
 2014-10-10 08:34:18 +02:00
Vinnie Okada 85f1e8b84a Remove unused method 2014-10-09 22:33:29 -05:00
Dmitriy Zaporozhets d59192f81d Merge branch 'annotate' into 'master' 
Annotate

See merge request !1167
 2014-10-09 15:56:11 +00:00
Valery Sizov 82c938ad75 annotate 2014-10-09 18:22:20 +03:00
Dmitriy Zaporozhets 6303d003c6 Merge branch 't1254-snippets-refactoring' into 'master' 
Snippets need to be either public/internal/private

See merge request !1162
 2014-10-09 14:56:35 +00:00
Dmitriy Zaporozhets 2bfc2f805b Merge branch 'bump-grit' into 'master' 
Bump grit

Fixes gitlab/grit#7

See merge request !1166
 2014-10-09 14:25:51 +00:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets d567dd33db Bump gitlab-grit version with improved timeout feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-09 16:33:03 +03:00
Dmitriy Zaporozhets 2fb99c79ff Merge branch 'ruby-version' into 'master' 
Ruby version

I set it to the latest ruby stable version, that in my experience works without issues.

/cc @jw

See merge request !1163
 2014-10-09 11:26:38 +00:00
Marin Jankovski f7dc15c6bd Revert "Up version of html-pipeline-gitlab." 
This reverts commit 17835f095f.
 2014-10-09 11:49:28 +02:00
Job van der Voort deffd2e538 set the development ruby version automatically 2014-10-09 09:29:10 +02:00
Dmitriy Zaporozhets d9aa3f9215 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-08 20:33:42 +03:00
Dmitriy Zaporozhets 629bd2831f Remove border radius because it has wrong background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 20:33:28 +03:00
Dmitriy Zaporozhets a1e2fb8458 Merge pull request #7986 from liammonahan/master 
Correctly pluralize participants on issue show page
 2014-10-08 20:15:02 +03:00
Dmitriy Zaporozhets 21e9ed2eaf Merge branch 'improve-danger-zone' into 'master' 
Improve danger zone

* show transfer/remove boxes by default
* ask person to type project name before transfer/remove

Fixes #1347

See merge request !1161
 2014-10-08 13:58:31 +00:00
Liam Monahan 48bc9e3623 Correctly pluralize participants on issue show page. 2014-10-08 09:00:47 -04:00
Dmitriy Zaporozhets ab68fd2206 Restyle colorful panel boxes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 15:47:24 +03:00
Dmitriy Zaporozhets 80f9b758e0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-08 15:08:22 +03:00
Dmitriy Zaporozhets b485fdb5c1 Improve project remove spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 15:05:14 +03:00
Marin Jankovski 17835f095f Up version of html-pipeline-gitlab. 2014-10-08 13:44:24 +02:00
Dmitriy Zaporozhets 74217f753f Apply ConfirmDangerModal for project transfer/remove actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 13:57:54 +03:00
Dmitriy Zaporozhets 9021debf50 ConfirmDangerModal window added. It will be used for confirmation of dangerous actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 13:56:57 +03:00
Robert Schilling e1123e08f4 Merge pull request #7988 from marcaube/patch-1 
Import - Display message when skipping repo
 2014-10-08 12:05:18 +02:00
Dmitriy Zaporozhets b694bf6f64 Merge pull request #7545 from buildbox/buildbox-service 
Buildbox Service Integration
 2014-10-08 12:34:22 +03:00
Keith Pitt f013973d19 Handle the case where the CI service may not provide a status_img_path method. 2014-10-08 17:22:41 +08:00
Dmitriy Zaporozhets e8a826030e show danger settings by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 11:54:51 +03:00
Dmitriy Zaporozhets d30e1f5cb8 Merge pull request #7983 from cirosantilli/factor-issue-mr-service 
Factor issue and merge request services
 2014-10-08 11:39:19 +03:00
Dmitriy Zaporozhets ac7fab7311 Merge pull request #7938 from cirosantilli/factor-dashboard-helper 
Factor dashboard helper methods.
 2014-10-08 11:38:22 +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
Keith Pitt 4c7da578f2 Merge branch 'master' into buildbox-service 
Conflicts:
	app/models/project.rb
 2014-10-08 16:33:53 +08:00
Dmitriy Zaporozhets 928178deb9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-08 11:30:06 +03:00
Keith Pitt 76594d474c Added support for Buildbox 2014-10-08 16:30:04 +08:00
Dmitriy Zaporozhets 3b6f8309f3 Merge branch 'developer-can-push-wiki' into 'master' 
Developer can push wiki

Fixes #1630

See merge request !1159
 2014-10-08 08:29:05 +00:00
Sytse Sijbrandij 3fff9aa34f Merge pull request #7981 from cirosantilli/www-to-about 
Replace www.gitlab.com with about.gitlab.com
 2014-10-08 09:46:51 +02:00
Robert Schilling f25673794e Merge pull request #7992 from cirosantilli/upcate-feature 
Upcase missing feature names
 2014-10-08 00:31:34 +02:00
Robert Schilling 9e0a7ecb43 Merge pull request #7991 from cirosantilli/app-finders-readme 
Improve formatting of app/finders/README.md [failure unrelated]
 2014-10-08 00:30:22 +02:00
Ciro Santilli 901d099cea Upcase missing feature names 2014-10-07 23:28:38 +02:00
Ciro Santilli 7984065776 Improve formatting of app/finders/README.md 2014-10-07 22:39:45 +02:00
Ciro Santilli 23b4a2e721 Factor issue and merge request services 2014-10-07 21:12:18 +02:00
Marc Aubé ae5381f2cc Update import.rake 
Output a message when a repo is skipped
 2014-10-07 14:13:50 -04:00
Robert Schilling e95a8e1500 Merge pull request #7985 from cirosantilli/outdated-comment 
Remove outdated comment from commits_controller
 2014-10-07 19:02:52 +02:00
Ciro Santilli ceaebe233c Remove outdated comment from commits_controller 2014-10-07 18:52:16 +02:00