Commit Graph
24537 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 3d1de5ba35 Merge branch 'rs-wiki-toc' into 'master'
Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilter

Closes #2494

See merge request !2952
2016-03-01 16:06:40 +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
Kamil Trzciński 8cba0612e1 Merge branch 'fix-failing-tests' into 'master'
Precompile assets before all spinach tests

Try to fix failing tests.

cc @jschatz1 

See merge request !3041
2016-03-01 15:36:38 +00:00
Jacob Schatz 1bdc274f64 Fix issue with overlap of sidebar links. 2016-03-01 10:18:05 -05:00
Kamil Trzcinski 182533608c Precompile assets before all spinach tests 2016-03-01 15:54:25 +01: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 c50a20e790 Merge branch 'comment-batch-size' into 'master'
Batch size >1000 does not pay off

We did a small experiment to see how a full scan of the Redis keys on
gitlab.com speeds up as we increase the batch size. The values on the
right are time in seconds for a full scan (no delete operations).

```
count: 10);      284.500529021
count: 100);      86.21216934
count: 1_000);    60.931676195
count: 10_000);   60.96355610
count: 100_000);  62.378172541
```

It looks like 1,000 is a good number.

See merge request !2970
2016-03-01 13:52:49 +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
Dmitriy Zaporozhets 7d41e4dc9d Merge branch 'rs-update-rails' into 'master'
Update Rails to 4.2.5.2

See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ
and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ

See merge request !3019
2016-03-01 11:25:29 +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
James Lopez 3292940745 Merge branch 'feature/slacky-builds-v2' into 'master'
Add commit message to slack script

Ass suggested by @rdavila, this adds the current commit message as of HEAD to the slack script.

See merge request !3027
2016-03-01 09:11:00 +00:00
James Lopez bc0d66645b fix syntax error 2016-03-01 10:03:37 +01:00
James Lopez 99d8c03d4a added commit message to slack script 2016-03-01 09:54:30 +01:00
Achilleas Pipinellis 581da235bf Merge branch 'triggers_link' into 'master'
Add link to triggers doc in variables section

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

See merge request !3025
2016-03-01 07:58:39 +00:00
Achilleas Pipinellis 141783d592 Add link to triggers doc in variables section
[ci skip]
2016-03-01 09:57:09 +02:00
Robert Speicher dc1c4e0712 Update Rails to 4.2.5.2
See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ
and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ
2016-02-29 17:45:56 -05: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
Jacob Schatz e5276ee6ab Merge branch 'issue_13212' into 'master'
Fixes padding loss after editing a diff comment

Also applies .timeago() to comment datetimes when diff page is entered directly.

Also fixes the vertical position of the comment count icon.

See merge request !3012
2016-02-29 21:20:40 +00: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 333ad73e76 Merge branch 'revert-6f85eb38' into 'master'
Revert "Merge branch 'issue_5854' into 'master'"

This reverts merge request !2992

cc @rdavila 

See merge request !3013
2016-02-29 18:00:09 +00:00
Robert Speicher edf5e9eb05 Merge branch 'fix/project-wiki-ending' into 'master'
Fix for project paths ending in .wiki

This prevents `Git operation was rejected by pre-receive hook` when
an actual project ending with .wiki is thought to be a wiki by the
`Internal` API.

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

See merge request !2960
2016-02-29 17:50:40 +00: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
Dmitriy Zaporozhets 864eb8cd23 Merge branch 'fix-migration' into 'master'
Fix broken migration

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

For !2927 

See merge request !3011
2016-02-29 16:03:53 +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
Dmitriy Zaporozhets 7e5e825a65 Fix broken migration
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-29 16:41:45 +01: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