home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,172 Commits 48 Branches 340 Tags
fdff815a4cddd9e956d1bf4cc8f01eeb3384b9ee
Commit Graph
16172 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher fdff815a4c Add Markdown feature specs for markup inside links 
It was already working, just want to make sure we don't break it in the
future.
 2015-05-06 17:21:19 -04:00
Dmitriy Zaporozhets 5b3c823fc9 Make header title bold and line between header lighter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 18:27:44 +03:00
Dmitriy Zaporozhets f78dfa6da7 Merge branch 'refactor-mr-form' into 'master' 
Refactor mr form

* re-use issuable form for new mr page
* small UI improvements to MR compare and new pages

See merge request !616
 2015-05-06 14:50:33 +00:00
Dmitriy Zaporozhets ea6667b06c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-06 17:49:05 +03:00
Sytse Sijbrandij dd37aa06ca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-06 16:48:05 +02:00
Dmitriy Zaporozhets 065637a80e Merge branch 'ui-improvements' into 'master' 
Small UI improvements to make project sidebar more neat

* make sidebar blocks more compact
* make clone panel smaller for better aspect ratio
* make `forked from` section cleaner

Screenshot:

![Screenshot_2015-05-06_16.42.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/69723db619ae7ae4d9551f6340d45384/Screenshot_2015-05-06_16.42.12.png)

cc @rspeicher

See merge request !617
 2015-05-06 14:47:42 +00:00
Sytse Sijbrandij 48f22a39e7 Merge branch 'single-docker-image' into 'master' 
Single docker image

See merge request !1805
 2015-05-06 14:40:02 +00:00
Sytse Sijbrandij 6518c728ac Small improvements to the dockerfile. 2015-05-06 16:39:30 +02:00
Dmitriy Zaporozhets c66e575179 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 17:00:19 +03:00
Dmitriy Zaporozhets fb00ed9983 Make README link on project home look nicer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:52:04 +03:00
Dmitriy Zaporozhets 342078a76d Small UI improvements to make project sidebar more neat 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:38:45 +03:00
Sytse Sijbrandij e8edd20bfd Made a single docker file. 2015-05-06 15:32:29 +02:00
Dmitriy Zaporozhets d49b993929 Small UI improvements to MR form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:19:09 +03:00
Dmitriy Zaporozhets cd108a828b Re-use issuable_form for new merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:11:47 +03:00
Dmitriy Zaporozhets 86ec49add4 Merge pull request #8800 from jirutka/email-settings 
Allow to configure smtp and sendmail in gitlab.yml
 2015-05-06 15:59:21 +03:00
Dmitriy Zaporozhets 3f2282300d Merge branch 'mr-change-branches' into 'master' 
When use change branches link at MR form - save source branch selection instead of target one

Fix for https://dev.gitlab.org/gitlab/gitlabhq/issues/1800

cc @jacobvosmaer

See merge request !615
 2015-05-06 12:46:42 +00:00
Dmitriy Zaporozhets 22d5e9855c When use change branches link at MR form - save source branch selection instead of target one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 15:13:11 +03:00
Jakub Jirutka b4be7aed77 Allow to configure smtp and sendmail in gitlab.yml 2015-05-06 13:15:33 +02: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
Valery Sizov 2144cc710a fix gitlab CI links 2015-05-05 14:02:31 +03: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
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