home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
41 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
Dmitriy Zaporozhets f5e0e5c0a3 Replace old logo with new one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 16:59:16 +02:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Douwe Maan 1981174a1e Fix 422 error page. 2015-05-13 09:41:56 +02:00
Douwe Maan bd8ff93c8c Improve text on error pages. 2015-05-13 09:41:55 +02:00
Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb
 2015-04-20 19:19:27 +03:00
hellerve 0afccd1dd8 Fixed typo in deploy html 2015-04-20 10:38:38 +02:00
Dmitriy Zaporozhets 31af3f4003 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	spec/models/note_spec.rb
 2015-03-19 23:21:50 -07:00
Dmitriy Zaporozhets efd8491d49 Revert "Increase timeout for Git-over-HTTP requests." 
This reverts commit 516bcabbf4.

Conflicts:
	Gemfile
 2015-03-19 18:29:20 -07:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Douwe Maan 516bcabbf4 Increase timeout for Git-over-HTTP requests. 2015-03-04 23:20:47 +01:00
Marin Jankovski 79a10b15e7 Add help_text to help text, login and static error pages. 2015-02-26 12:23:09 -08:00
Drew Blessing 84df1bb467 Custom header logo 2014-12-29 13:42:15 -06:00
Dmitriy Zaporozhets aedb20113d Merge pull request #6879 from arantir/patch-1 
Typo fix
 2014-05-01 22:51:56 +03:00
Dmitriy Zaporozhets c8c9c365a0 Add apple-touch-icon-precomposed.png because of 404 on iOS devices 2014-04-29 08:28:03 +02:00
arantir 292c3c210b Typo fix 2014-04-27 00:16:50 +03:00
Yang Li 8c7f4f2bba Add icon for iOS home screen 2014-04-05 11:13:38 +08:00
Robert Speicher 5b4aba5f56 Make sure important directories exist in git 
Ensures the following directories exist after a git clone:
- public/uploads
- tmp/pids
- tmp/sockets
 2014-03-30 22:45:28 -04:00
dosire 3a48e1cfd1 Truthful wording. Fixes #934 2014-02-04 11:39:07 +01:00
Jacob Vosmaer 5de16dee76 Add a custom 502 page 2014-01-28 10:19:22 +01:00
Kevin Lyda 58408b96f3 Another optipng run over png's. 
Ran optipng -o7 -fix over all png files. This should make pages load a
tiny bit faster (you can test this with the pagespeed tool on firefox or
chrome).

It might be an idea to add *lossless* image compression optimization
runs to the release process.
 2014-01-05 13:56:31 +00:00
Hilton Bristow 4c53d6f3db Updated favicon.ico to include retina assets and migrated from GL to cat glyph 2013-11-29 09:53:14 +10:00
Dmitriy Zaporozhets f45f033199 Add logo to deploy.html 2013-02-16 21:35:11 +02:00
Dmitriy Zaporozhets 558369731f Add deploy.html for symlink if maintaince 2013-01-27 19:09:40 +02:00
Dmitriy Zaporozhets c873cf81f6 Restyled error messages in common way. Added title to head partial 2012-11-28 19:40:54 +02:00
Dmitriy Zaporozhets 05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Saito c5b12fad44 fix No route matches static.css Error 2012-05-23 11:00:51 +08:00
Andrey Vakarev b7160380ed Get rid of useless public/index.html (auto-generated file when new rails app was created) 2012-05-20 02:15:12 +03:00
Kenneth Vestergaard 01bb42ae02 Fix very minor spelling issue. 2012-04-23 17:41:15 +03:00
Dmitriy Zaporozhets 81092c0198 Status codes for errors, New error pages 2012-02-23 21:04:20 +02:00
Dmitriy Zaporozhets 8db72a2844 updated githost error page 2012-01-22 13:00:26 +02:00
exupero 86eb61d3ed Updated error page title to "gitolite" from "gitosis". 2012-01-06 15:04:44 -05:00
shtirlic 2eb56e3d18 Delete .directory files 2012-01-01 21:37:32 +04:00
Dmitriy Zaporozhets 6e5caa1985 favicon updated 2011-12-28 09:18:50 +02:00
Dmitriy Zaporozhets cb021e5831 repo & project access separated. critical gitolite bugfix 2011-12-07 01:27:07 +02:00
Dmitriy Zaporozhets 80c34985c8 removed icons 2011-11-25 23:57:08 +02:00
Dmitriy Zaporozhets 06e916743e lil css style 2011-11-07 00:24:09 +02:00
gitlabhq 3becd06423 icons & css 2011-10-31 13:11:22 +03:00
Nihad Abbasov d62200cad4 clean-up code 
* Remove trailing whitespace
  * Converts hard-tabs into two-space soft-tabs
  * Remove consecutive blank lines
 2011-10-26 18:46:25 +05:00
gitlabhq ec9e54ea94 gitosis error handle 2011-10-10 00:15:28 +03:00
gitlabhq 9ba1224867 init commit 2011-10-09 00:36:38 +03:00