home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,897 Commits 48 Branches 340 Tags
bbca6a0abd9f5559fe4abbf2cb2100a0e4717ac8
Commit Graph
698 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 490cf7bfce Improve protected branches selectbox options 2015-02-03 18:12:20 -08:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -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 7d48205c1a Rubocop: comment indentation 2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets c427bf08e4 Rubocop: Style/AlignArray enabled 2015-02-02 20:58:28 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets 4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets f1cf49218f Improve contribution calendar on user page 
* cache user contributions for day
* ignore forks in calendar contribtuions
 2015-01-29 17:07:44 -08:00
Marco Wessel 20e269cb92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection 
Conflicts:
	CHANGELOG
	db/schema.rb
 2015-01-30 00:16:24 +01:00
Dmitriy Zaporozhets ca701a9649 Improvements to LDAP::User model 
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
 2015-01-29 13:28:41 -08:00
Dmitriy Zaporozhets c9f18d4587 Make sure we dont have exception on date parsing 2015-01-29 01:03:20 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets 6e1f9e746c Merge branch 'gitlab_importer' into 'master' 
Ability to clone project using oauth2 token

See merge request !1447
 2015-01-29 07:03:30 +00:00
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -08:00
Dmitriy Zaporozhets 815e9aa283 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar 2015-01-28 22:52:44 -08:00
Dmitriy Zaporozhets 953c1fff8f Be more careful with parsing changes from gitlab-shell 2015-01-28 17:00:40 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Valery Sizov 54f6d8c7b5 an ability to clone project with oauth2 token 2015-01-28 15:57:31 -08:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' 
Move external issue tracker away from yml config

See merge request !1442
 2015-01-27 20:57:48 +00: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 a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Marin Jankovski 00a0d5aeea Move repetition to the parent. 2015-01-26 16:24:11 -08:00
Dmitriy Zaporozhets 3e47ea5064 Files::CreateService can now commit file to empty repository 2015-01-26 13:31:24 -08:00
Marin Jankovski 65e700472b Update the issue tracker attribute on issue tracker change. 2015-01-26 11:39:32 -08:00
Marco Wessel afce47923c actually fix indentation 2015-01-25 18:38:35 +01:00
Marco Wessel b20fc14133 Fix indentation 2015-01-25 18:34:02 +01:00
Marco Wessel aad6ceaef9 Allow configuring protection of the default branch upon first push 2015-01-25 17:09:10 +01:00
Marin Jankovski c70dcd2907 Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 2015-01-23 12:38:46 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Marin Jankovski 103a1bb06d Use service settings instead of config file settings to present issues. 2015-01-23 10:28:38 -08:00
Jacob Vosmaer f937e05949 Stop git zombie creation during force push check 2015-01-22 15:51:20 +01:00
Dmitriy Zaporozhets 0c4bb84910 Merge pull request #7762 from jubianchi/commit-closing-issues 
Allow commit messages to close several issues at once
 2015-01-21 11:49:13 -08:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Valery Sizov 6da0ab7d60 Github Importer: AJAX update status 2015-01-20 11:52:55 -08:00
jubianchi b21a2d821a Allow commit messages to close several issues at once (thanks @123Haynes 
for his work and help)
 2015-01-20 10:45:48 +01:00
Marin Jankovski 465f41673a Merge branch 'database-fix-setting' into 'master' 
Check for database connection when running current_application_settings

The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown.

See merge request !292
 2015-01-19 18:43:27 +00:00
Dmitriy Zaporozhets de27375d6c Test git builder over annotated tag 2015-01-15 11:17:47 -08:00
Dmitriy Zaporozhets a0d4235c04 Send checkout sha for web hooks and services 2015-01-15 10:26:33 -08:00
DJ Mountney 02d8575a61 Check for database connection before loading current application settings 2015-01-14 16:23:46 -08:00
Marin Jankovski e348af1d4c Rescue database error in application settings if the database still doesn't exist. 2015-01-14 09:03:25 +01:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Jacob Vosmaer 90e4b400ba Merge branch 'git-http-blacklist' into 'master' 
Git HTTP blacklist

See merge request !1328
 2015-01-13 10:02:49 +00: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
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Jacob Vosmaer bc95576e2c Rescue missing database errors 
While loading the Rails app we cannot assume that the gitlabhq_xxx
database exists already. If we do, `rake gitlab:setup` breaks!

This is a quick hack to make sure that fresh development setups of
GitLab (from master) will work again.
 2015-01-09 11:26:26 +01:00
Dmitriy Zaporozhets d531de0bc9 Merge branch 'popen_close_stdin' 
Conflicts:
	CHANGELOG
 2015-01-08 15:54:34 -08:00
Dmitriy Zaporozhets d0a50985ec Create ApplicationSettings if does not exist in runtime 2015-01-08 11:26:16 -08:00