Commit Graph
22224 Commits
Author SHA1 Message Date
Stan Hu d02d02c672 Fix error preventing displaying of commit data for a directory with a leading dot
Closes https://github.com/gitlabhq/gitlabhq/issues/8763
2015-10-12 22:24:19 -07:00
Чингиз Ауанасов 42fb52adf4 Use css style 2015-10-13 04:41:51 +06:00
Kamil Trzcinski 4bf69b0bd9 Fix feature tests 2015-10-12 23:59:21 +02:00
Kamil Trzcinski 766da5fa7b Fix broken matrix_for_ref?
Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
2015-10-12 22:34:59 +02:00
Kamil Trzcinski daca1c6511 Fix broken tests 2015-10-12 22:32:29 +02:00
Dmitriy Zaporozhets 1af4fcfa12 Fix typos in application.scss 2015-10-12 19:00:21 +00:00
Stan Hu e12b6f30ef Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-12 08:13:22 -07:00
Stan Hu e426c149d2 Merge pull request #9719 from teuneboon/master
Small typo fix when deleting groups
2015-10-12 08:09:24 -07:00
Kamil Trzcinski c61dc13150 Fix some changes 2015-10-12 16:41:36 +02:00
Kamil Trzcinski 5cd504ed33 Rename builds_without_retry to latest_builds 2015-10-12 16:39:08 +02:00
Kamil Trzcinski 2e9c1608e5 Fix commit skipping 2015-10-12 16:35:58 +02:00
Kamil Trzcinski 789fe7b489 Update rendering 2015-10-12 16:32:58 +02:00
Dmitriy Zaporozhets c8d01fa82a Merge branch 'reset_service_password' into 'master'
Invalidate stored service password if the endpoint URL is changed



See merge request !1558
2015-10-12 14:30:22 +00:00
Dmitriy Zaporozhets 4624e9e728 Merge branch 'spellcheck_false' into 'master'
Add spellcheck=false to certain input fields

https://dev.gitlab.org/gitlab/gitlabhq/issues/2563

See merge request !1559
2015-10-12 14:29:29 +00:00
Douwe Maan 6f35614852 Fix mentionable specs 2015-10-12 16:23:15 +02:00
Kamil Trzcinski 69c04498ef Small bug fixes 2015-10-12 15:55:12 +02:00
Douwe Maan 7a0cc665ff Remove useless assignment 2015-10-12 15:34:08 +02:00
Alex Lossent 024e34e94d Hide passwords to non-admin users in the services API
In order to be consistent with !1490 doing it for the web interface
2015-10-12 15:24:00 +02:00
Hannes Rosenögger cde076c525 Merge branch 'fix-patch_guide' into 'master'
don't set LATEST_TAG automatically in patch update guide

As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/2607, this removes the automatic setting of the LATEST_TAG variable in the update guide, because it could get set to rc versions.

Instead, a command was added to list all tags, with the most recent one being on the end of the list. Also a note was added to prevent users from updating to new minor/major versions because the tag list includes all tags.

[ci skip]

See merge request !1510
2015-10-12 13:20:07 +00:00
Dmitriy Zaporozhets c42d35b721 Add css welcome notice
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-12 15:08:33 +02:00
Dmitriy Zaporozhets bdd477a0f8 Re-organize GitLab css into 2 directories: framework and page specific css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-12 15:00:04 +02:00
Dmitriy Zaporozhets cba6d62323 Move CI styles to pages dir
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-12 14:49:23 +02:00
Douwe Maan 41075bad8d Chaining ftw 2015-10-12 14:39:33 +02:00
teuneboon 5479797f0a Make group deleted text consistent with group created and updated texts 2015-10-12 14:37:56 +02:00
teuneboon d6a523d785 Fix typo(missing quote) when deleting groups 2015-10-12 14:37:07 +02:00
Douwe Maan c2c8f8acc4 Remove warning about Reply by email and HA 2015-10-12 14:36:06 +02:00
Douwe Maan 27d952b119 Fix cross-references originating from notes 2015-10-12 14:30:44 +02:00
Kamil Trzcinski 0aefeeb882 Add Commit Status documentation 2015-10-12 12:42:27 +02:00
Valery Sizov 07f6055272 Invalidate stored service password if the endpoint URL is changed 2015-10-12 13:21:57 +03:00
Kamil Trzcinski 7ef156a242 Add author to statuses 2015-10-12 12:16:55 +02:00
Kamil Trzcinski 887494761e Fix commit status POST URL 2015-10-12 12:15:35 +02:00
Grzegorz Bizon b8f5e7427f Show notifications button even if user is not member of a project
Notifications button was unavailable if user wasn't member of the
project, even if protected project is available via group privileges.

Showing disabled button with explanation tool-tip is less confusing.

This closes #2846.
2015-10-12 12:07:31 +02:00
Valery Sizov d805c5dbb3 Add spellcheck=false to certain input fields 2015-10-12 12:54:54 +03:00
Douwe Maan b0164771ec Simplify code around (cross)-references 2015-10-12 11:54:46 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Han Loong Liauw 857cc388e1 Adds modified date to snippets#show #1767
- Fixed a bug with .btn-sm padding.
 - Changed created_at to modified_at for snippets#index as it seems to
   be more relevant.
2015-10-12 18:38:34 +11:00
Hannes Rosenögger 5ffbf5feb7 Merge branch 'docs-update' into 'master'
removed extra_sign_in_text examples for gitlab.rb [ci skip]

I removed the extra_sign_in_text option documentation. This is no longer needed because a welcome message aka. extra_sign_in_text can now be set/changed in the admin UI.  

Admin area > Settings

This was mentioned in issue #3006

See merge request !1565
2015-10-12 07:23:21 +00:00
Robert Speicher 42603af326 Merge branch 'fix_email_downcasing' into 'master'
LDAP email address downcasing

Fixes #2960

In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. 

If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved.

This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression.

See merge request !1550
2015-10-11 22:53:11 +00:00
Douwe Maan bf23ce191b Enable arbitration in MailRoom 2015-10-11 18:17:49 +02:00
Dale Noe 4ee8888498 removed extra_sign_in_text examples for gitlab.rb [ci skip] 2015-10-11 12:19:05 +00:00
Dmitriy Zaporozhets 03b7fe71a5 Merge branch 'rs-remove-slim' into 'master'
Remove slim

Closes #2897 

See merge request !1537
2015-10-10 23:12:37 +00:00
Robert Speicher c007d4a981 Add CHANGELOG entry for !1543
[ci skip]
2015-10-10 14:24:00 -04:00
Robert Speicher 5b0be0621d Merge branch 'master' into 'master'
Persist filters when sorting on user admin page

Closes #2806

See merge request !1543
2015-10-10 18:22:16 +00:00
Stan Hu 2df573dac3 Fix bug where merge request comments created by API would not trigger notifications
Closes https://github.com/gitlabhq/gitlabhq/issues/9715
2015-10-10 10:59:02 -07:00
Jerry LukinsandJerry Lukins 78de79d779 Persist filters when sorting on user admin page 2015-10-10 09:04:45 -04:00
Dmitriy Zaporozhets c99e9edce7 Merge branch 'fix-remove-button-alignment' into 'master'
In SSH key detailed view, align the "Remove" button with the right container

Also fixes a bootlint warning.

Before:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d6d8765ed9dceb6a31a6b4475b2166e1/image.png)

After:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/8252211125ace212335aa6bf2ba78549/image.png)


See merge request !1555
2015-10-10 11:23:36 +00:00
Dmitriy Zaporozhets 19fd34d9ef Merge branch 'make-diff-css-better-for-mobile' into 'master'
Make diff file view easier to use on mobile screens

Viewing diffs on a mobile screen is a bit of an awkward experience at the moment. Here are a few issues (by no means complete):

## Before

### Tabs are scrunched

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/45924e36cfb107dc56795a7dcdfbc5b5/image.png)

### Filenames take too much room, buttons cluttered

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a5e5611271fe26dfd3922aa0b8780458/image.png)

## After

This MR makes a few tweaks to make this a bit better. It just addresses a few issues, but there is plenty of room for improvement (e.g. shrink fonts, etc.):

### Eliminate padding to make tabs fit

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbcf128d1f221b9b9e53df274238dc62/image.png)

### Make filenames, buttons more readable

This screenshot allows the filename to use the whole row, omits the file mode changes, and puts the buttons centered in the view:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d2e5b9424f058827ba2552056c516e18/image.png)

Towards a better mobile experience: #2787 

See merge request !1449
2015-10-10 08:21:04 +00:00
Чингиз Ауанасов a972ce17ca + and Titleize New Project button on dashboard 2015-10-10 14:07:12 +06:00
Dmitriy Zaporozhets 468c355910 Merge branch 'rs-update-whenever' into 'master'
Remove whenever gem

Closes #2879 

See merge request !1538
2015-10-10 07:44:30 +00:00
Robert Speicher 766688d0fd Update monthly release post template
[ci skip]
2015-10-09 18:11:18 -04:00