home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
469 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -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
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Valery Sizov 54f6d8c7b5 an ability to clone project with oauth2 token 2015-01-28 15:57:31 -08: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
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Dmitriy Zaporozhets 577fe18073 Merge pull request #7878 from cirosantilli/rm-seed-password-confirmation 
Remove unneeded password_confirmation from seed.
 2015-01-18 10:38:41 -08:00
Dmitriy Zaporozhets 38600e328b Validate application settings only if column exists 2015-01-16 17:22:17 -08:00
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Dmitriy Zaporozhets 72c3d728c4 Update db schema 2015-01-13 10:45:14 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Dmitriy Zaporozhets c6810fd779 Merge branch 'feature/custom_app_logo' into 'master' 
Custom header logo

# What does this MR do?

Adds enterprise feature that enables administrator to customize the small header logos in the header/navigation bar. There are 2 custom logos that must be uploaded - one for light themes and one for dark themes.

Both a `dark` and `light` logo must be uploaded for the custom header logo. There are validations to prevent only one. Otherwise if a user chooses a light logo they might have a custom logo but another user with a dark theme would see the standard GitLab logo.

# Are there points in the code the reviewer needs to double check?

Look at the `appearances_helper.rb`, specifically the `brand_header_logos` method. I tried to keep all of the logic inside the appearances helper to avoid future merge conflicts in the view. Is there a better way to do this other than inline styles?

See code comment in `appearances_helper.rb` for another question.

# Why was this MR needed?

Enterprise users like the ability to brand GitLab to their organization. The appearances support was a great first step. This builds upon that by allowing users to upload logos for the header.

# Screenshots

Appearances admin page showing what the page looks like after custom logos have been uploaded. I added the basic and dark backgrounds to the respective logos so they appeared closer to how they will in the header.

![appearances_admin](https://gitlab.com/uploads/subscribers/gitlab-ee/c7e0338be2/appearances_admin.png)

With a dark theme selected.

![dark_logo](https://gitlab.com/uploads/subscribers/gitlab-ee/31faaf70f6/dark_logo.png)

With a light theme selected.

![light_logo](https://gitlab.com/uploads/subscribers/gitlab-ee/46b4942df8/light_logo.png)

See merge request !26
 2014-12-30 13:32:08 +00:00
Dmitriy Zaporozhets 00b7cae980 Remove ldap_cn and ldap_access fields from namespaces table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 12:03:40 +02:00
Drew Blessing 84df1bb467 Custom header logo 2014-12-29 13:42:15 -06:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Ciro Santilli faab452af9 Remove unneeded password_confirmation from seed. 2014-12-28 14:42:15 +01:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Marin Jankovski 6ce3b1a311 Add migration for developers can push to protected branches flag. 2014-12-26 09:07:02 +01:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets 554719d985 Merge branch 'fix-mysql-migration' into 'master' 
Fix mysql migration

Fixes exception noted in https://gitlab.com/gitlab-org/gitlab-ce/issues/913

```
** Invoke db:migrate (first_time)
** Invoke environment (first_time)
** Execute environment
** Invoke db:load_config (first_time)
** Execute db:load_config
** Execute db:migrate
== 20141121161704 AddIdentityTable: migrating =================================
-- create_table(:identities)
   -> 0.1214s
-- add_index(:identities, :user_id)
   -> 0.1660s
-- execute("INSERT INTO identities (provider, extern_uid, user_id)\nSELECT provider, extern_uid, id FROM users\nWHERE provider IS NOT NULL\n")
   -> 0.0518s
-- remove_column(:users, :extern_uid)
rake aborted!
StandardError: An error has occurred, all later migrations canceled:

Mysql2::Error: Duplicate entry 'ldap' for key 'index_users_on_extern_uid_and_provider': ALTER TABLE `users` DROP `extern_uid`/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `query'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `block in execute'
```

See merge request !1344
 2014-12-23 09:58:54 +00:00
Dmitriy Zaporozhets 1440ac8154 Remove index only if exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 11:05:50 +02:00
Dmitriy Zaporozhets 031461e106 Fix migration issue for mysql with index not being removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 10:52:21 +02:00
Dmitriy Zaporozhets 223e509f70 Merge pull request #7894 from cirosantilli/fix-dev-user-seed 
Fix dev user seed: ID was used twice.
 2014-12-20 20:18:15 +02:00
Marin Jankovski 6ab5127bfa Merge branch 'master' into group_membership_lock 
Conflicts:
	db/schema.rb
 2014-12-16 14:34:32 +01:00
Valery Sizov cbabc0b2f3 Kerberos: update docs 2014-12-15 18:07:03 +02:00
Marin Jankovski c19248a285 Add group membership lock field to namespaces. 2014-12-12 13:52:36 +01:00
Dmitriy Zaporozhets 8eb29cd5d6 Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:32:15 +02:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Valery Sizov 7d8dfccf70 speed up migration to identities 2014-12-08 15:15:11 +02:00
Dmitriy Zaporozhets 1961b59070 Add locked_at to merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:42:26 +02:00
Dmitriy Zaporozhets 9ceccf7cf5 Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:08:26 +02:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Valery Sizov 1a80d13a39 Multi-provider auth. LDAP is not reworked 2014-12-04 13:01:50 +02:00
Marin Jankovski df5b37376d Add merge request rebase enabled column to projects table. 2014-11-26 13:15:42 +01:00
Jacob Vosmaer 4053c055be Add missing timestamps to the 'members' table 2014-11-21 15:02:23 +01:00
Marin Jankovski cf6b622686 Add audit event table. 2014-11-18 16:51:05 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Dmitriy Zaporozhets f56541de9a Revert "Create dev fixture projects with fixed visibility" 
This reverts commit a9fadce361.
 2014-11-10 16:17:04 +02:00
Marin Jankovski 1d337defec Merge pull request #8168 from cirosantilli/dev-fixtures-visibility 
Create dev fixture projects with fixed visibility
 2014-11-07 15:26:48 +01:00
Marin Jankovski e45d5f7f44 Fix broken ldap migration. 2014-11-07 13:50:54 +01:00
Don Luchini 019c0f9e0f Remove unnecessary lines. 2014-11-05 08:57:05 -05:00
Don Luchini bc403356bb Do not require immediate password reset if specifying one when seeding database. 2014-11-04 10:02:38 -05:00
Valery Sizov c9470f5c78 Ability to block commits with certain filenames 2014-11-03 18:22:43 +02:00