Commit Graph
17567 Commits
Author SHA1 Message Date
Job van der Voort f91f583ff7 Merge branch '7102' into 'master'
add 7.10.2-ee pkgs

See merge request !389
2015-05-07 07:55:09 +00:00
Job van der Voort 76383e9f02 add 7.10.2-ee pkgs 2015-05-07 09:54:39 +02:00
Dmitriy Zaporozhets 201f867e69 Merge branch 'ce-to-ee' into 'master'
CE to EE

See merge request !387
2015-05-06 12:54:38 +00:00
Dmitriy Zaporozhets 23b4cc060f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
2015-05-06 14:28:11 +03:00
Dmitriy Zaporozhets 548b41bf6d Fix db schema
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-06 14:26:46 +03:00
Dmitriy Zaporozhets 12966fb62d Merge branch 'skip-commit-git-hook-for-tag' into 'master'
Skip git hooks commit validation when pushing new tag.

Addresses gitlab/gitlabhq#2190.

See merge request !386
2015-05-06 11:23:20 +00:00
Robert Schilling 7af59c54fc Merge pull request #9248 from rumpelsepp/fix-modal
Fix a trailing new line
2015-05-06 12:43:03 +02:00
Stefan Tatschner dc68179b59 Fix a trailing new line
The "How to Merge" modal included a trailing new line in the code
block. This commit removes that disfigurement.
2015-05-06 11:10:48 +02:00
Jeroen van Baarsen 2856d5f9fc Merge pull request #9241 from Soullivaneuh/button-type
Fix missing button types
2015-05-06 10:19:17 +02:00
Dmitriy Zaporozhets b4150137e9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-06 11:16:01 +03:00
Dmitriy Zaporozhets f4de5d519d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-06 11:15:41 +03:00
Dmitriy Zaporozhets bb3d7b0558 Merge branch 'refactor-project-page' into 'master'
Improve project home page usability

I looked at project page and saw next problems with it:

* a lot of information but not separated on blocks - hard to understand
* unclear how to contribute to project

Instead of complete redesign I followed step-by-step changes.

### Step 1

First of all I separated Repository and Contribution blocks.
Contribution block should makes it easy for people to contribute. Even when we visit GitHub project page its not clear how to start. Our Contribution section should help with it. All repository stats and download button moved to Repository block.

![Screenshot_2015-05-05_11.49.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e69977603acfdc381acb539b19e8cba1/Screenshot_2015-05-05_11.49.16.png)

### Step 2

Next step was to make top section less loaded. I moved clone panel to sidebar because it is very heavy element and rarely used. If you use web editor - you dont even use it. If you work via http/ssh you will copy remote only once. So my idea - it should be on home page but should not be in center of attention.

![Screenshot_2015-05-05_12.47.04](https://gitlab.com/gitlab-org/gitlab-ce/uploads/41633cc8915bb12c979230567b40aea4/Screenshot_2015-05-05_12.47.04.png)

See merge request !610
2015-05-06 08:14:10 +00:00
Robert Schilling 9184657871 Merge branch 'fix-devise-email-display-name' into 'master'
Use the configured display name in e-mails from Devise mailer

By default, it is set to "GitLab", but a user may configure the display name to something else.

See merge request !613
2015-05-06 06:20:21 +00:00
Robert Schilling f78cd577e5 Merge branch 'improve-restricted-domains-help' into 'master'
Improve help line for restricted domain signups

The setting may be misconstrued as only allowing access from certain domains. Add help to clarify this applies to e-mail domains.

See merge request !612
2015-05-06 06:17:30 +00:00
Stan Hu 1dc906d586 Use the configured display name in e-mails from Devise mailer 2015-05-05 19:54:21 -07:00
Stan Hu a1c6f7ce20 Improve help line for restricted domain signups 2015-05-05 19:46:37 -07:00
Dmitriy Zaporozhets 16db90e5fc Fix project test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 21:43:33 +03:00
Dmitriy Zaporozhets cecfbd55de Restlye project sidebar a bit to make it more clear
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 19:38:53 +03:00
Dmitriy Zaporozhets 3b0cf49f33 Fix project description and avatar alignment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 19:25:18 +03:00
Patricio Cano 69f3b40031 Fixed broken permissions link. 2015-05-05 16:14:54 +00:00
Dmitriy Zaporozhets 2a1be883c8 Add changelog item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 18:34:49 +03:00
Dmitriy Zaporozhets ac7b12c0e8 Fix right margin for project description
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 18:34:05 +03:00
Dmitriy Zaporozhets ebcc810b9d Remove project dropdown and fix db sche,a
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 18:29:23 +03:00
Dmitriy Zaporozhets 5bff135fb3 Merge branch 'fix_ci_services' into 'master'
Fix CI links on MR page

Fixes gitlab-org/gitlab-ci#145

See merge request !609
2015-05-05 15:22:01 +00:00
Dmitriy Zaporozhets 30c6dbe36d Show CI link on project home page only if CI enabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 17:30:50 +03:00
Dmitriy Zaporozhets 040ee6f897 Reorganize elements in project sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 16:45:53 +03:00
Douwe Maan 4dfaed34b2 Skip git hooks commit validation when pushing new tag. 2015-05-05 15:44:36 +02:00
Valery Sizov 2144cc710a fix gitlab CI links 2015-05-05 14:02:31 +03:00
Dmitriy Zaporozhets 68ee397208 Merge branch 'ce-to-ee' into 'master'
CE to EE

See merge request !385
2015-05-05 10:52:36 +00:00
Dmitriy Zaporozhets 7da7a790fa Move clone panel to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 13:09:50 +03:00
Dmitriy Zaporozhets 4adac0b4be Remove unnecessary info from project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:49:49 +03:00
Dmitriy Zaporozhets 478a4b19da Turn sidebar in sections with contribute and repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:47:01 +03:00
Dmitriy Zaporozhets 3ce0557ab0 Move tabs with activity/readme to section
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:29:52 +03:00
Dmitriy Zaporozhets 31e5cd214e Move project section to own partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:26:27 +03:00
Dmitriy Zaporozhets 04e365ebb7 Move project sidebar to separate partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:23:25 +03:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
2015-05-05 10:18:27 +02:00
Robert Schilling 1132084d3f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-05 08:12:22 +02:00
Robert Schilling 4fd3be137b Merge branch 'master' into 'master'
Docker: update omnibus package

See merge request !605
2015-05-05 06:11:39 +00:00
Sullivan SENECHAL 5bc5188a06 Fix missing button types 2015-05-05 00:45:06 +02:00
Robert Schilling b1c331a441 Merge pull request #9238 from quodos/master
Update spelling in comments in authentication.rb
2015-05-04 21:30:03 +02:00
Marin Jankovski 595931580d Merge branch 'improve-external-issue-tracker-config-doc' into 'master'
Improve documentation of configuring external issue trackers

There was some confusion over the deprecated `:issues_tracker_id` field. Added documentation.

Closes #1514

See merge request !580
2015-05-04 16:02:05 +00:00
Dmitriy Zaporozhets 3ccdc02b89 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-04 18:07:09 +03:00
Dmitriy Zaporozhets c874422bb0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-04 18:07:03 +03:00
Stan Hu 07dc517017 Improve documentation of configuring external issue trackers
Closes #1514
2015-05-04 07:33:25 -07:00
quodos b953796ac8 Update authentication.rb
correct spelling
2015-05-04 14:09:03 +02:00
Jakob Englisch b7decf1de7 Docker: update omnibus package 2015-05-04 10:50:52 +00:00
Job van der Voort 2587334a79 Merge branch 'Add_doc_block_new_users_by_default' into 'master'
Added " How to maintain tight control over the number of active users..."

Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation.

Please check that documentation is OK before accepting Merge. I took if from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example#L149

cc/ @sytse

See merge request !1792
2015-05-04 09:13:53 +00:00
Job van der Voort 2530141ace update doc by removing unnecessary parts 2015-05-04 11:13:07 +02:00
Dmitriy Zaporozhets 16db51ec58 Merge branch 'fix-wiki-search' into 'master'
Fix Error 500 when searching Wiki pages

If a Wiki page turns up a hit in the search results, an error will occur:

```
Completed 500 Internal Server Error in 836ms

NoMethodError - undefined method `slug' for "test.markdown":String:
  app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path'
  app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700'
  actionview (4.1.9) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:143:in `render'
```

An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case.

Closes #1547

See merge request !592
2015-05-04 08:53:21 +00:00
Dmitriy Zaporozhets f4d05dcc90 Merge pull request #9097 from sselberg/add-current_sign_in_at-to-rest-api
Add current_sign_in_at to api User
2015-05-04 11:03:25 +03:00