Commit Graph
24501 Commits
Author SHA1 Message Date
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
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
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
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 cd391b66e9 Merge branch 'rs-data-links' into 'master'
Sanitize `data` and `vbscript` links

Closes #13625 

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660

See merge request !2905
2016-02-29 13:22:38 +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
Achilleas Pipinellis 9a7690f9e2 Merge branch 'ci_examples' into 'master'
Improve discoverability for CI examples

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

See merge request !3008
2016-02-29 12:54:28 +00:00
Achilleas Pipinellis 9e3c78724b Link to examples page
[ci skip]
2016-02-29 14:50:08 +02:00
Achilleas Pipinellis f742ddeebe Reorganize CI sections and give descriptive names to links 2016-02-29 14:44:08 +02:00
Achilleas Pipinellis e1e6dd76f5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ci_examples 2016-02-29 13:31:17 +02:00
Douwe Maan 17251cf447 Merge branch 'rs-development-docs' into 'master'
Add "Gotchas" to development docs

Also:

- Alphabetizes the "Developer" index page
- Fixes the broken `db_dump.md` link

See merge request !2846
2016-02-29 11:00:33 +00:00
James Lopez 3ac202c30f fixed merge conflict and refactored specs 2016-02-29 10:59:16 +01: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
James Lopez 6b27b9f91c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-wiki-ending 2016-02-29 10:46:05 +01:00
Phil Hughes 2f0c3ca352 Changed too many changes buttons to white
Closes #13751
2016-02-29 09:18:29 +00:00
Robert Speicher f838dbe4d1 Update CHANGELOG
[ci skip]
2016-02-27 19:27:57 -05:00
Achilleas Pipinellis 47ae0c370b Merge branch '13679-fix' into 'master'
Adjust documentation of permissions

## What does this MR do?
This MR improves the documentation of the permissions by mentioning that internal projects do not enforce the Guest role.
## Are there points in the code the reviewer needs to double check?
No code was touched - only the documentation was adjusted.
## Why was this MR needed?
Without this adjustment it might not be clear how you can set up an internal project to be pullable by everyone whilst having the issue tracker and labels managed by permitted people only.
## What are the relevant issue numbers?
#13679 

See merge request !2925
2016-02-27 23:26:33 +00:00
Thomas Schmidt d324c67db3 Adjust documentation of permissions
[ci skip]
2016-02-27 23:26:04 +01:00
Robert Speicher 65040978db Merge branch 'rs-fix-issue-filter-spec' into 'master'
Fix issue milestone filter spec

See merge request !2990
2016-02-27 21:38:13 +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 4fcaa7a474 Fix issue milestone filter spec 2016-02-26 18:14:49 -05: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
Achilleas Pipinellis cbd9f1bc09 Move languages to examples 2016-02-26 22:51:07 +02: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
Alfredo Sumaran dead4f2906 Update CHANGELOG 2016-02-26 12:30:40 -05: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
Kamil Trzciński baa5f7fc25 Merge branch 'feature/slacky-builds-v2' into 'master'
Add builds URL to gitlab-ci script

Add builds URL to gitlab-ci script

Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2681

See merge request !2962
2016-02-26 15:00:15 +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