Commit Graph
12413 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d4e327a592 Merge branch 'login-flash' into 'master'
Add bottom margin for flash container on login page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @skyruler 

Fixes #13935 

See merge request !3040
2016-03-01 16:10:44 +00:00
Dmitriy Zaporozhets 352ea5d6d0 Merge branch 'sidebar-overlap-fix' into 'master'
Fix issue with overlap of sidebar links.

Thanks @iamphill for the help with this one. 

![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png)

cc @iamphill @alfredo1 @dzaporozhets @rymai 

See merge request !3043
2016-03-01 16:10:22 +00:00
Douwe Maan ad9137a785 Merge branch 'rs-avatar-validation' into 'master'
Only validate avatar cropping values when avatar is present AND changed

Closes #13905

See merge request !3018
2016-03-01 16:03:38 +00:00
Douwe Maan acd9881061 Merge branch 'rs-fix-user-namespace_uniq' into 'master'
Properly check for a pre-existing error in `User#namespace_uniq`

Rails adds an empty error to the Errors object even if you just call
`#[]` on it:

```
[1] pry(main)> u = User.last
[2] pry(main)> u.errors.keys
=> []
[3] pry(main)> u.errors[:username].present?
=> false
[4] pry(main)> u.errors.keys
=> [:username]
```

See merge request !3017
2016-03-01 16:02:57 +00:00
Douwe Maan 204a989533 Merge branch 'rs-improve-grace-period' into 'master'
Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014
2016-03-01 16:01:18 +00:00
Jacob Schatz 1bdc274f64 Fix issue with overlap of sidebar links. 2016-03-01 10:18:05 -05:00
Dmitriy Zaporozhets b43d022c66 Add bottom margin for flash container on login page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-01 15:36:19 +01:00
Jacob Schatz b2f0b3f145 Merge branch 'mr-prefix-activity-view' into 'master'
Changed # to ! on merge requests on activity view

Closes #9082

![Screen_Shot_2016-02-23_at_11.59.55](/uploads/87b859ae63282ae24025168404beb158/Screen_Shot_2016-02-23_at_11.59.55.png)

See merge request !2938
2016-03-01 14:02:43 +00:00
Douwe Maan fac1e0e83c Merge branch 'safe-content-type' into 'master'
Explain why we mangle blob content types

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079

See merge request !2956
2016-03-01 13:39:26 +00:00
Phil Hughes 43f3439d98 Changed page title 2016-03-01 13:15:09 +00:00
Phil Hughes faac0f261e Fixed issue based on feedback with link text output 2016-03-01 13:04:59 +00:00
Phil Hughes 8e8df6d562 Removed un-used variables 2016-03-01 13:03:39 +00:00
Phil Hughes fbe6b8eeca Replaced prefix with to_reference method calls 2016-03-01 13:03:39 +00:00
Phil Hughes aff5e73f2a Changed # to ! on merge requests on activity view
Closes #9082
2016-03-01 13:03:39 +00:00
Rémy Coutable 5b22ee50e3 Merge branch 'issue_13851' into 'master'
Brings back missing "Gitlab" text on the logo

Closes #13851 

See merge request !2989
2016-03-01 10:54:17 +00:00
Douwe Maan dc6099a5fa Merge branch 'fix/contributions-forked-projects' into 'master'
include contributions from forked projects on profile calendar

Shows contributions from forked projects in the calendar

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3612

See merge request !2918
2016-03-01 10:06:56 +00:00
Robert Speicher 58a8d6e9ba Only validate avatar cropping values when avatar is present AND changed
Closes #13905
2016-02-29 17:19:53 -05:00
Robert Speicher 128757a7f9 Properly check for a pre-existing error in User#namespace_uniq
Rails adds an empty error to the Errors object even if you just call
`#[]` on it:

```
[1] pry(main)> u = User.last
[2] pry(main)> u.errors.keys
=> []
[3] pry(main)> u.errors[:username].present?
=> false
[4] pry(main)> u.errors.keys
=> [:username]
```
2016-02-29 17:10:46 -05:00
Robert Speicher b0ec9529e2 Don't show any "2FA required" message if it's not actually required
Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.
2016-02-29 13:58:36 -05:00
Robert Speicher 3334c3fc70 Reset otp_grace_period_started_at after disabling 2FA
Prior, if the user enabled 2FA, then disabled it and came back some time
after the grace period expired, they would be forced to enable 2FA
immediately.
2016-02-29 13:56:40 -05:00
Dmitriy Zaporozhets e7364050b0 Revert "Merge branch 'issue_5854' into 'master' "
This reverts merge request !2992
2016-02-29 17:30:41 +00:00
Dmitriy Zaporozhets 6f85eb3851 Merge branch 'issue_5854' into 'master'
Add commit message to JIRA's notification payload.

Closes #5854 

See merge request !2992
2016-02-29 17:29:07 +00:00
Alfredo Sumaran 4f529a8806 Merge branch 'master' into issue_13212 2016-02-29 12:04:45 -05:00
Dmitriy Zaporozhets eb9838d38b Merge branch 'issue_13648' into 'master'
Improve implementation to check read access to forks and add pagination.

Fixes #13648 

The following optimizations where made:

- Pagination was added.
- Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project.


See merge request !2991
2016-02-29 17:00:23 +00:00
Alfredo Sumaran 45c29fa289 Comment icon vertically aligned 2016-02-29 11:02:57 -05:00
Alfredo Sumaran c4b9b2cfcf Wrap icon with edited time 2016-02-29 11:01:28 -05:00
Alfredo Sumaran a0f440efd3 Increase padding 2016-02-29 10:55:50 -05:00
Alfredo Sumaran fa1fa437ca Keep edited time on the same line as well 2016-02-29 10:53:44 -05:00
Alfredo Sumaran 9f2eb025d3 Apply nice date when diff page loads 2016-02-29 10:50:35 -05:00
Alfredo Sumaran 1a94a569cf Keep date in the same line 2016-02-29 10:49:48 -05:00
Alfredo Sumaran 60799ae3f6 Prevent content misalignment 2016-02-29 10:45:49 -05:00
Alfredo SumaranandJacob Schatz befbb3004a Bring back Gitlab text 2016-02-29 10:26:52 -05:00
Jacob Schatz a8f87ec877 Merge branch 'removed-ngprogress' into 'master'
Removed NGProgress

In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator

Ref #13820 

![loading](/uploads/8b6ed8982e86e4b94803b56b8cd97737/loading.gif)

See merge request !3004
2016-02-29 15:21:47 +00:00
Jacob Schatz 7b689fb525 Merge branch 'too-many-changes-btns' into 'master'
Changed too many changes buttons to white

Closes #13751 

![Screen_Shot_2016-02-29_at_09.18.41](/uploads/30f5d11d1a4e1785561597feeeb40f09/Screen_Shot_2016-02-29_at_09.18.41.png)

See merge request !3002
2016-02-29 14:59:56 +00:00
James Lopez 8fe72af3dc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributions-forked-projects 2016-02-29 15:49:00 +01:00
Dmitriy Zaporozhets 912e643815 Merge branch 'improve-todos-css' into 'master'
Small css cleanup for todos feature

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Cleanup for !2817

Fixes #13816 

cc @jschatz1 @skyruler @dbalexandre 

See merge request !2996
2016-02-29 14:36:46 +00:00
Douwe Maan 2ea8f71bb4 Merge branch '11489-branded-appearance-to-ce' into 'master'
Branded appearance to CE

Closes #11489 

The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.

TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?

@rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉 

/cc @DouweM

See merge request !2927
2016-02-29 13:18:29 +00:00
Douwe Maan a297e44048 Merge branch 'issue_13621' into 'master'
Don't repeat labels listed on Labels tab.

Fixes #13622 

See merge request !2924
2016-02-29 13:16:00 +00:00
Phil Hughes cb0e26d1f7 Removed NGProgress
In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator

Ref #13820
2016-02-29 09:47:22 +00:00
Phil Hughes 2f0c3ca352 Changed too many changes buttons to white
Closes #13751
2016-02-29 09:18:29 +00:00
Rubén Dávila 8c948548e1 Logged in user should be able to read internal forks. 2016-02-27 10:04:36 -05:00
Dmitriy Zaporozhets 72d02821dd Small css cleanup for todos feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-27 11:39:33 +01:00
Rubén Dávila 496b9c0761 Add commit message to JIRA's notification payload. 2016-02-26 20:11:34 -05:00
Rubén Dávila f96ce4079f Improve implementation to check read access to forks and add pagination. 2016-02-26 19:34:52 -05:00
Robert Speicher 20ac35e924 Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master'
Strip leading and trailing spaces in URL validator

_Originally opened at !2914 by @evuez._

It makes URLs in webhooks valid even if they contain leading and/or trailing spaces.

Spaces are hard to notice in input fields, this helps users by accepting leading and trailing spaces in webhooks URLs.

Fixes #13652

See merge request !2939
2016-02-26 23:35:43 +00:00
Robert Speicher 2c6e34bc16 Merge branch 'repository-caching-refactor' into 'master'
Refactor Repository Caching

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515

See merge request !2936
2016-02-26 22:07:50 +00:00
evuezandRobert Speicher 4d0e2979b9 Allow webhooks URL to have leading and trailing spaces 2016-02-26 14:34:06 -05:00
Jacob Schatz 01160fc061 Merge branch 'avatar-cropping' into 'master'
Fix avatar stretching by providing a cropping feature

Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773

Fixes #7959

See merge request !2951
2016-02-26 17:56:24 +00:00
Rémy Coutable 4bff9daf8b Merge branch 'sidebar-hide-class' into 'master'
Created helper class to hide content in issue sidebar when collapsed

![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png)

Closes #13764

See merge request !2968
2016-02-26 16:42:25 +00:00
Dmitriy Zaporozhets cc8b08722d Merge branch 'refactor-lists' into 'master'
Refactor html/css for lists and improve help UI page

* dry lists html/css removing a lot of style duplicates
* fix snippets list to match common style
* fix extra bottom margin for groups list
* improve help page ui so it looks clean

Fixes #11873 

See merge request !2977
2016-02-26 14:59:32 +00:00