Commit Graph
19641 Commits
Author SHA1 Message Date
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
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
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
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
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
Stan Hu 882bef79e7 Merge branch 'update-changelog-for-emoji-fix' into 'master'
Update CHANGELOG for Emoji fix in a3c6ed5c4

[ci skip]

See merge request !1556
2015-10-09 14:48:08 +00:00
Stan Hu 7713a70954 Update CHANGELOG for Emoji fix in a3c6ed5c4
[ci skip]
2015-10-09 06:43:18 -07:00
Dmitriy Zaporozhets 1a881a71f5 Merge branch 'fix-issue-filter-dropdown-labels' into 'master'
Restore placeholders in issue filters from "Any" to "Milestone" and "Label"

1f11096c included new filters but made it hard to determine which dropdown did
what. This patch restores the original placeholders.

### Before

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

### After

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


See merge request !1554
2015-10-09 12:59:37 +00:00
Stan Hu 972b637081 In SSH key detailed view, align the "Remove" button with the right container 2015-10-09 05:30:42 -07:00
Stan Hu b5d9a613d9 Make diff file view easier to use on mobile screens 2015-10-09 05:01:27 -07:00
Douwe Maan df3ae4ef13 Merge branch 'rs-issue-2970' into 'master'
Normalize space-like characters in keys before output to gitlab-shell

gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.

Closes #2970

See merge request !1552
2015-10-09 11:38:59 +00:00
Douwe Maan 192dd58d03 Merge branch 'rs-mr-tab-loader' into 'master'
Make the loading spinner toggle more explicit

Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥

See merge request !1553
2015-10-09 11:36:15 +00:00
Sytse Sijbrandij ab5066e5e6 Merge branch 'clarify_support' into 'master'
Clarify support request message

Since we have the (GitLab.com) Support Forum, this message may be slightly confusing. Hopefully this wording improves understanding. If anyone has suggestions on making this clearer I'm open.

See merge request !1406
2015-10-09 08:27:38 +00:00
Jacob Vosmaer 6e1ec3b9af Merge branch 'rs-2fa-task' into 'master'
Add task to disable 2FA for all users

Addresses #2971 

See merge request !1532
2015-10-09 08:04:34 +00:00
Dmitriy Zaporozhets 6ba1e17c44 Merge branch 'improve_empty_fork' into 'master'
Show message if user tries to fork and has no available namespaces

This merge request improves the UX when users try to fork a project and have no eligible namespaces. 

### Current behavior

![Screen_Shot_2015-09-25_at_1.39.45_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/45a303703a0197e78f7f9bdbea8718b5/Screen_Shot_2015-09-25_at_1.39.45_PM.png)

### Proposed behavior

![Screen_Shot_2015-09-25_at_1.38.57_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/613c53bcfb52d79fdf8bd1d09410c152/Screen_Shot_2015-09-25_at_1.38.57_PM.png)

### Things to check

I'm not exactly loving the wording I have here. I'm open to improvements.


See merge request !1441
2015-10-09 07:44:21 +00:00
Dmitriy Zaporozhets 63adaacdc8 Merge branch 'fix-header-hamburger-positioning' into 'master'
Fixed positioning of hamburger menu on header

Hey guys just noticed the hamburger menu for the top navigation was mis-aligned on 
`gitlab-ce:master` and `gitlab.com`.
I was not able to find an open issue or merge request directly referencing this issue so thought I would add a quick fix.

### Changes

This MR changes the vertical positioning from `top` to vertical margins (Like in bootstrap itself).
 - Also added a minor fix to remove `border-top` from the collapse menu so its the same height as the navigation.
 - finally added an active class to the hamburger toggle so you can see when its open.

This changes an element in `app/views/layouts/header/_default.html.haml` and thus would impact most pages behind login.

## Screenshots

### Before

![before](https://gitlab.com/hanloong/gitlab-ce/uploads/e3d4631dd0420ec0e9048c435a2f734b/before.png)

### After

![after](https://gitlab.com/hanloong/gitlab-ce/uploads/7c93c3ef1b01fbefc39c5a1ed61c2d1b/after.png)

Happy to discuss any changes/suggestions.

Thanks

See merge request !1541
2015-10-09 07:40:09 +00:00
Stan Hu b60bc655f2 Restore placeholders in issue filters from "Any" to "Milestone" and "Label"
1f11096c included new filters but made it hard to determine which dropdown did
what. This patch restores the original placeholders.
2015-10-08 23:53:32 -07:00
Robert Speicher cd46f4c367 Add output and confirmation to gitlab:two_factor:disable_for_all_users 2015-10-08 23:19:56 -04:00
Han Loong Liauw 95411f7151 fixed positioning of hamburger menu on header
- Changed to margin for vertical allign as used in bootstrap 3 original
 - Also added an `active` state to show when the extra items are enabled
2015-10-09 14:05:55 +11:00
Robert Speicher 0c8ac98153 Remove slim 2015-10-08 21:04:11 -04:00
Robert Speicher 29fe488b0c Make the loading spinner toggle more explicit
Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥
2015-10-08 20:53:29 -04:00
Robert Speicher 69b41ba043 Normalize space-like characters in keys before output to gitlab-shell
gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.

Closes #2970
2015-10-08 20:34:50 -04:00
Robert Speicher 6f79b5336f Just kidding, we're deleting whenever entirely 2015-10-08 18:04:16 -04:00
Drew Blessing 37e9359432 Clarify support request message 2015-10-08 15:27:44 -05:00
Drew Blessing fce4f13803 Show message if user tries to fork and has no available namespaces 2015-10-08 15:20:19 -05:00
Drew Blessing b7def88c02 Fix ldap email downcasing bug 2015-10-08 14:59:46 -05:00
Stan Hu 680b6d88a5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-08 10:39:37 -07:00
Stan Hu 9440589197 Merge pull request #9693 from bbodenmiller/patch-1
allow crawling of commit page but not patch/diffs
2015-10-08 10:37:23 -07:00
Douwe Maan 6db238dee9 Merge branch 'workaround-seed-fu-issue' into 'master'
Fixes GDK issue where repos would not be imported properly

Seed-Fu runs this entire fixture in a transaction, so the `after_commit`
hook won't run until after the fixture is loaded. That is too late
since the Sidekiq::Testing block has already exited. Force clearing
the `after_commit` queue to ensure the job is run now.

See: gitlab-org/gitlab-development-kit#58

See merge request !1513
2015-10-08 16:10:14 +00:00
Dmitriy Zaporozhets 1115caf8e3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-10-08 17:42:42 +02:00
Dmitriy Zaporozhets 0a8f90a040 Merge remote-tracking branch 'public/project-find-with-namespace-performance'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-08 17:42:14 +02:00
Stan Hu fb7922a8d5 Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master'
Update upgrade guide for Redis >= 2.4.0 requirement

[ci skip]

Closes #2837

See merge request !1468
2015-10-08 15:00:20 +00:00
Dmitriy Zaporozhets 69bcef32e1 Merge remote-tracking branch 'public/trending-projects-performance' 2015-10-08 16:22:43 +02:00
Dmitriy Zaporozhets a2374758e3 Merge branch 'implement-new-gitlab-colors' into 'master'
Add new GitLab colors

After this merge request all css must use variables for colours.

![7Od6vP7usJ__1_](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01dd327770f25c76448a5860a76e34c9/7Od6vP7usJ__1_.png)
 
cc @skyruler 

See merge request !1542
2015-10-08 13:38:10 +00:00
Yorick Peterse 2d779f70ae Added changelog for project namespace performance 2015-10-08 14:35:37 +02:00
Yorick Peterse c8f18fc562 Added dedicated Rake task for setting up Postgres
This ensures any PostgreSQL specific schema changes (e.g. expression
indexes) are created when setting up the database.
2015-10-08 14:35:36 +02:00
Yorick Peterse 03417456f0 Revamp finding projects by namespaces
By using a JOIN we can remove the need for using 2 separate queries to
find a project by its namespace. Combined with an index (only needed for
PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the
first call) down to roughly 10 ms (~15 ms for the first call).
2015-10-08 14:35:32 +02:00
Dmitriy Zaporozhets dc400a7414 Improve help/ui page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-08 13:47:59 +02:00
Dmitriy Zaporozhets 057b1c317b Add new GitLab colors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-08 13:29:14 +02:00
Stan Hu c789452134 Merge branch 'XenGi/gitlab-ce-master' 2015-10-08 03:41:07 -07:00
Dmitriy Zaporozhets d4892e4144 Merge branch 'rs-update-slack-notifier' into 'master'
Update slack-notifier to ~> 1.2.0

Closes #2826 

See merge request !1533
2015-10-08 09:33:48 +00:00
Dmitriy Zaporozhets cb00c15532 Merge branch 'rs-update-tinder' into 'master'
Update tinder to ~> 1.10.0

Closes #2823 

See merge request !1534
2015-10-08 09:26:44 +00:00
Dmitriy Zaporozhets 2272e1d419 Merge branch 'rs-update-rack-cors' into 'master'
Update rack-cors to ~> 0.4.0

Closes #2800 

See merge request !1536
2015-10-08 09:25:33 +00:00