home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,336 Commits 48 Branches 340 Tags
c6efa56ee7039882625942ce29ea9fdeeffaa6cd
Commit Graph
12336 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c6efa56ee7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-22 18:12:16 +03:00
Dmitriy Zaporozhets 18ba6987cd Merge branch 'fix_milestone_link' into 'master' 
Fix milestone link in issue page. Closes #174

For a complete description see #174.

See merge request !196
 2014-10-22 14:15:33 +00:00
Dmitriy Zaporozhets ece9036614 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-22 17:04:45 +03:00
Dmitriy Zaporozhets 3220e191ae Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-path 
Remove unneeded app/finders config.autoload path
 2014-10-22 16:56:07 +03:00
Dmitriy Zaporozhets ce01916a68 Merge pull request #8026 from HerrBerg/master 
rake:import:repos: fix exclude wiki regex for importing repositories
 2014-10-22 16:55:25 +03:00
Dmitriy Zaporozhets 80e944ac71 Merge pull request #8054 from bbodenmiller/patch-4 
match latest config from https://cipherli.st/
 2014-10-22 16:52:42 +03:00
Dmitriy Zaporozhets d0296fc915 Merge branch 'master' into 'master' 
fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono"

Everything is better than "Courier New" ...

See merge request !210
 2014-10-22 13:52:09 +00:00
Marin Jankovski 5e2a1c14eb Merge branch 'fix-500-login-disabled' into 'master' 
Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209
 2014-10-22 12:42:41 +00:00
Dmitriy Zaporozhets b0ef23c193 Fix 500 error on login page if ldap enabled and sign-in disabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 13:38:47 +03:00
Dmitriy Zaporozhets 05f19392b7 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:11:18 +03:00
Dmitriy Zaporozhets c5ad011917 Merge branch 'fix-ldap-check' into 'master' 
Fix ldap check

Fixes gitlab/gitlabhq#1691

See merge request !1206
 2014-10-22 08:07:08 +00:00
Dmitriy Zaporozhets da21b9e7d0 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-21 18:26:40 +03:00
Valery Sizov 47064ea55c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-21 14:26:10 +03:00
Jacob Vosmaer 5661451c36 Merge branch 'doc-ldap_user_filter' into 'master' 
Update LDAP documentation

See merge request !1199
 2014-10-21 11:25:46 +00:00
Valery Sizov a443c4c88f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-21 14:24:28 +03:00
Sytse Sijbrandij 2e4a33b287 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-21 13:22:07 +02:00
Sytse Sijbrandij e6631c8786 Merge request for blog post on gitlab.com next time. 2014-10-21 13:21:58 +02:00
Valery Sizov fbe9b00fc9 Merge branch 'slack_team_name' into 'master' 
Slack team name

Fixes a problem in slack team name with hyphens.

https://gitlab.com/gitlab-org/gitlab-ce/issues/701

See merge request !1204
 2014-10-21 11:19:52 +00:00
Robert Schilling d29dd2cfec Merge pull request #8117 from cirosantilli/improve-grack-comment 
Improve grack auth hooks comment.
 2014-10-21 13:10:00 +02:00
Jacob Vosmaer b78cd70d33 Merge pull request #8046 from bbodenmiller/patch-3 
fix permission issue in upgrade guide
 2014-10-21 13:06:01 +02:00
Ciro Santilli ce056d8074 Improve grack auth hooks comment. 2014-10-21 12:36:09 +02:00
Dmitriy Zaporozhets 302a6c00bf Merge branch 'master' of github.com:gitlabhq/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-10-21 13:11:59 +03:00
Dmitriy Zaporozhets 53419bf330 Merge branch 'qwazerty-hipchat_api' into 'master' 
Add Hipchat services API

Manual merge of https://github.com/gitlabhq/gitlabhq/pull/7633

See merge request !1202
 2014-10-21 10:11:13 +00:00
Dmitriy Zaporozhets 6c8d3bd658 Merge pull request #8093 from cirosantilli/rm-duplicate-derived-admin-repository-method 
Remove unused admin/projects#repository method
 2014-10-21 13:01:07 +03:00
Dmitriy Zaporozhets 31de763e81 Merge pull request #8015 from Soullivaneuh/server-timezone 
Add timezone configuration to gitlab.yml
 2014-10-21 12:50:32 +03:00
Marin Jankovski ce61de68ba Use allowed slack team name. 2014-10-21 11:38:41 +02:00
Marin Jankovski cccfede34c Add test for allowed team name of slack. 2014-10-21 11:33:26 +02:00
Sullivan SENECHAL 593a287c8d Add timezone configuration to gitlab.yml 2014-10-21 11:27:16 +02:00
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names 
Factor admin logs [failure unrelated]
 2014-10-21 11:59:41 +03:00
Dmitriy Zaporozhets c36a9e4cbf Merge pull request #8029 from cirosantilli/rm-projects-controller-filter 
Remove unused filter from ProjectsController
 2014-10-21 11:58:08 +03:00
Ciro Santilli 2c98584a9c Remove unused admin/projects#repository method 
Already defined on the ApplicationController base class.
 2014-10-21 10:56:11 +02:00
Dmitriy Zaporozhets 1657750a6a Merge pull request #8028 from cirosantilli/rm-dev-tools 
Remove unused dev_tools helper.
 2014-10-21 11:55:36 +03:00
Dmitriy Zaporozhets c624b45bd0 Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwazerty-hipchat_api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-10-21 11:46:45 +03:00
Dmitriy Zaporozhets c3b81e5f40 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-21 11:44:18 +03:00
Dmitriy Zaporozhets 8ad9a75f88 Merge pull request #8030 from cirosantilli/factor-authorize 
Factor authorize_push! and authorize_code_access!
 2014-10-21 11:43:12 +03:00
Dmitriy Zaporozhets 85ddf1b918 Merge pull request #8087 from cirosantilli/end_with 
Replace match with end_with: more readable, faster
 2014-10-21 11:42:50 +03:00
Dmitriy Zaporozhets 5ce9f89c7b Merge pull request #8102 from cirosantilli/use-memoized-project 
Use @project on controllers, don't call method
 2014-10-21 11:41:03 +03:00
Dmitriy Zaporozhets 456de99b9b Merge pull request #8101 from cirosantilli/rm-project-id-admin-project-controller 
Remove param[:project_id] at admin controller
 2014-10-21 11:40:46 +03:00
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms 
Factor group forms
 2014-10-21 11:39:41 +03:00
Dmitriy Zaporozhets d545bb8de4 Merge pull request #8097 from cirosantilli/dry-mentioned-in 
DRY mentioned in magic note constant
 2014-10-21 11:39:02 +03:00
Sytse Sijbrandij 6d7c4c04ed Merge pull request #8109 from cirosantilli/contributing-style-vs-min 
State on CONTRIBUTING that people should fix line style of touched lines
 2014-10-21 10:32:02 +02:00
Ciro Santilli 19ab9b40b8 State on CONTRIBUTING fix line style 2014-10-21 10:29:26 +02:00
Robert Schilling ad774c2017 Merge pull request #8110 from cirosantilli/coffee-uniform-export 
Export all coffee classes with @
 2014-10-21 09:11:58 +02:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button 
Factor choose group avatar button
 2014-10-21 08:25:09 +02:00
Robert Schilling 5b3bf155cb Merge pull request #8112 from cirosantilli/factor-group-tips 
Factor group tips
 2014-10-21 08:23:27 +02:00
Ciro Santilli 3a47ed979a Factor group forms 2014-10-21 00:25:44 +02:00
Ciro Santilli 01db264ffc Factor choose group avatar button 2014-10-20 23:57:46 +02:00
Ciro Santilli f7d01f2067 Factor group tips 2014-10-20 23:43:51 +02:00
Ciro Santilli c0c8dccf2e Export all coffee classes with @ 2014-10-20 23:03:33 +02:00
Dmitriy Zaporozhets 3f4cfd362d Merge branch 'fix-500-admin-projects' into 'master' 
Fix 500 error when filtering projects in admin interface

Fixes #1693

See merge request !1200
 2014-10-20 17:05:35 +00:00