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
835 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
Dmitriy Zaporozhets 986c5b6f87 Merge branch 'foo-barred' into 'master' 
Fix the intermittently failing "Bar" search tests.

Over the past several months we've come to calling them the foobarred tests. We've seen them fail on our jenkins server, and on the GitLab semaphore tests.

In this merge request I scope the test checks for the foo barred tests to check within the .search-results div.

Fixes #567

See merge request !258
 2015-02-04 22:57:41 +00:00
Sytse Sijbrandij 7b233ea853 Spelling improvement, add in a group, not into group. 2015-02-03 16:55:31 -08:00
Dmitriy Zaporozhets d5d1802096 Set right test as tricky 2015-01-29 23:48:00 -08:00
Dmitriy Zaporozhets 23c31a0b12 Skip tricky test for semaphore 2015-01-29 23:06:43 -08: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
Dmitriy Zaporozhets b076d8cddb Fix test for merge request 2015-01-28 15:36:12 -08:00
Dmitriy Zaporozhets f57bffc82a Merge branch 'init-from-ui' into 'master' 
Add tests for creating bare repo and first file in UI

Part of #1930

See merge request !1444
 2015-01-27 21:27:59 +00: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
Dmitriy Zaporozhets e956066d4a Add tests for initializing bare repo and creating new file in it 2015-01-27 12:19:32 -08:00
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08: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 90ba3a385c Fix tests for blobs refactoring 2015-01-26 16:08:59 -08:00
Marin Jankovski 9b5b334a79 Remove unused feature steps. 2015-01-26 16:04:08 -08:00
Dmitriy Zaporozhets ed91378627 Fix blob controller rendering in case of errors 2015-01-26 15:12:13 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +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
Valery Sizov 1809b3ee36 Spinach for admin applications 2015-01-19 11:18:00 -08:00
Dmitriy Zaporozhets e7f772550c Add tests to home page url redirect 2015-01-16 16:09:20 -08:00
Dmitriy Zaporozhets 9c0d241e27 Fix tests 2015-01-16 08:47:58 -08:00
Dmitriy Zaporozhets dbd54fad51 Merge pull request #7905 from cirosantilli/visible-false 
Change always passing visible false tests.
 2015-01-15 14:41:41 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01:00
Dmitriy Zaporozhets 36acf5b293 Revert "Fix tests" 
This reverts commit 1e45ba7f16.
 2015-01-14 17:22:48 -08:00
Dmitriy Zaporozhets 1e45ba7f16 Fix tests 2015-01-14 16:23:20 -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 fc63690d84 Merge branch 'admin_email_groups_and_projects_select' into 'master' 
Admin email groups and projects select box

Fixes #219

See merge request !288
 2015-01-12 17:02:14 +00:00
Dmitriy Zaporozhets f891ababeb Fix randomly failing test 2015-01-10 21:42:16 -08:00
Marin Jankovski 562857d635 Fix admine email spec. 2015-01-09 16:19:23 +01: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 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Dmitriy Zaporozhets 5dbbec4612 Merge pull request #8520 from cirosantilli/edit-blob-link-tests 
Add tests for disabled blob edit button cases v2
 2015-01-03 14:07:43 +02:00
Ciro Santilli 67b06e7a9b Change always passing visible true tests to false. 2015-01-02 00:20:19 +01:00
Dmitriy Zaporozhets 884352294d Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 20:10:46 +02:00
Ciro Santilli 18fa155025 Add tests for disabled blob edit button cases. 2014-12-30 18:19:48 +01:00
Dmitriy Zaporozhets 0930086bea Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 16:38:27 +02: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 15a0e1d6b9 Fix tests for share project with group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 12:48:29 +02:00
Marin Jankovski eb29648bf4 Fix the ssh keys test. 2014-12-30 11:47:13 +01:00
Drew Blessing 84df1bb467 Custom header logo 2014-12-29 13:42:15 -06:00
Marin Jankovski c1e57b47b8 Add feature spec for user ssh keys on admin page. 2014-12-29 18:40:25 +01:00
Dmitriy Zaporozhets 3d2f123081 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 13:31:30 +02:00
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity 
Teamcity integration using 8.1 rest api
 2014-12-28 22:11:29 +02:00
Dmitriy Zaporozhets b8bffc0da2 Dont check for milestone description on group milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-27 17:48:10 +02:00
Dmitriy Zaporozhets 465f186954 Show assigned issues/mr be default on dashboard 
This was default before but now it fixed with providing assignee_id
parameter making url shareble and dont reset when other filters users.

Also this commit removes old methods that are not used any more.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 18:33:53 +02: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
Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
 2014-12-25 18:48:15 +02:00
Dmitriy Zaporozhets aadfb3665f Fix tests and add message if no oauth apps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:46:19 +02:00
Dmitriy Zaporozhets fca161f5c5 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:12 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00