home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ciro Santilli 166c215a75 Make new and edit file submit more uniform 2014-10-08 10:01:07 +02: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 10783f4d7b Remove unneeded app/finders config.autoload path 
Every directory under app/ is searched by default
 2014-10-07 23:41:02 +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
Vinnie Okada 68b5ac7f18 Add option to keep repo on project delete 
Update the project API controller to use `Projects::DestroyService`
instead of calling `Project#destroy` directly.

Also add an optional parameter, `:keep_repo`, that allows a project to
be deleted without deleting the repository, wiki, and satellite from
disk.
 2014-10-07 15:21:00 -05:00
Ciro Santilli 23b4a2e721 Factor issue and merge request services 2014-10-07 21:12:18 +02:00
Ciro Santilli 6d4076fdc6 Disallow POST to compare: does not create objects 2014-10-07 20:48:39 +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
Vinnie Okada 9dcb643fd4 Rename coffeescript file 2014-10-07 11:17:04 -05:00
Dmitriy Zaporozhets 06c91aa20e Improve wiki path parsing in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 17:28:55 +03:00
Dmitriy Zaporozhets 51ed8b7edd Merge branch 'mr-widget-css' into 'master' 
Style merge request CI widget to match MR/Issue box

![Screenshot 2014-10-07 15.13.12](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/7208a92094/Screenshot_2014-10-07_15.13.12.png)

![Screenshot 2014-10-07 15.13.25](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/f04d8d3f7b/Screenshot_2014-10-07_15.13.25.png)

See merge request !1158
 2014-10-07 14:26:08 +00:00
Sytse Sijbrandij dd005ca482 Merge branch 'gitlabflow-references' into 'master' 
Gitlabflow references

See merge request !1160
 2014-10-07 14:02:00 +00:00
Job van der Voort 3386a82d5e add references to gitlab flow article 2014-10-07 15:50:23 +02:00
Dmitriy Zaporozhets 0bf99f6557 Developers can push to wiki repo. Protected branches does not affect wiki repo any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 16:05:24 +03:00
Dmitriy Zaporozhets 8fad7e63a3 Add a bit of space between star icon and text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 15:22:55 +03:00
Dmitriy Zaporozhets 593a1b3b3e Style merge request CI widget to match MR/Issue box 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 15:11:18 +03:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Dmitriy Zaporozhets c0306f78d2 Merge branch 't1254-snippets-refactoring' into 'master' 
Snippets refactoring: rename public to internal. STEP 1

See merge request !1157
 2014-10-07 10:05:59 +00:00
Marin Jankovski bbc52b0000 Use double quotes because we are inserting password now. 2014-10-07 11:48:25 +02:00
Marin Jankovski 0fd06adf0c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-07 11:20:35 +02:00
Marin Jankovski 90cb56f033 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-07 11:20:13 +02:00