Commits · f7a9fc9cf81e8d58abb6e5b4c607626d0026c763 · nexedi / gitlab-ce

27 Mar, 2016 5 commits

Merge branch 'upgrade-teaspoon' into 'master' · f7a9fc9c

Robert Speicher authored Mar 27, 2016

Upgrade Teaspoon from 1.0.1 to 1.1.5.

Includes compatibility with Rails 5.

See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).

Working towards #14286.

See merge request !3409

f7a9fc9c

Merge branch 'upgrade-bullet' into 'master' · 8edb3163

Robert Speicher authored Mar 27, 2016

Upgrade Bullet to 5.0.0

Includes Rails 5 support.

[See changelog for details](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).

Working towards #14286.

See merge request !3396

8edb3163

Merge branch 'bug-in-webhooks-documentation-14660' into 'master' · cff31423
Achilleas Pipinellis authored Mar 27, 2016
```
Fix typos in webhooks docs



See merge request !3416
```
cff31423
Fix typos in webhooks docs. · ac7d4a40
Achilleas Pipinellis authored Mar 27, 2016
```
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14660
```
ac7d4a40

Merge branch 'handle-avatar-in-empty-repo' into 'master' · c1834664

Stan Hu authored Mar 27, 2016

Don't attempt to look up an avatar in repo if repo directory does not exist

Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/

Closes #14580



See merge request !3390

c1834664

26 Mar, 2016 5 commits

Merge branch 'feature/fuzz-search-min-width' into 'master' · 8034e1a1

Jacob Schatz authored Mar 26, 2016

Fuzzy search dropdown UI element min-width (issue 14644)

Short project names sometimes result in an unusable fuzzy search UI element. Therefore, I added a min-width CSS property with a value of 175px.

See here for details but it's fairly straight forward:
https://gitlab.com/gitlab-org/gitlab-ce/issues/14644

Before:
<br />
![Screen_Shot_2016-03-25_at_20.03.54](/uploads/2bdc048bd818cdcd228bb2d19a10b5d2/Screen_Shot_2016-03-25_at_20.03.54.png)

After:
<br />
![Screen_Shot_2016-03-25_at_20.19.29](/uploads/be23938757f67ffebb96c9bdc8229c5b/Screen_Shot_2016-03-25_at_20.19.29.png)

See merge request !3407

8034e1a1

Bump VERSION · 1922e3a8
Dmitriy Zaporozhets authored Mar 26, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
1922e3a8
Merge branch 'feature--preferences-dashboard-groups' of https://gitlab.com/eliasw/gitlab-ce · ea8bd204
Dmitriy Zaporozhets authored Mar 26, 2016

ea8bd204

Merge branch 'rs-remove-release-docs' into 'master' · c44de4f2

Dmitriy Zaporozhets authored Mar 26, 2016

Remove release docs from the CE repository

More detailed, updated, and accurate versions of these docs now live in
https://gitlab.com/gitlab-org/release-tools

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

[ci skip]

See merge request !3393

c44de4f2

Merge branch 'ci-setup-info' into 'master' · 2fdf928a

Dmitriy Zaporozhets authored Mar 26, 2016

Add links to CI setup documentation from project settings and builds pages

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

See merge request !3384

2fdf928a

25 Mar, 2016 16 commits
- Upgrade Teaspoon from 1.0.1 to 1.1.5. · e664d954
  connorshea authored Mar 25, 2016
```
Includes compatibility with Rails 5.

See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
```
  e664d954
- short project names result in unusable fuzz search UI elements, so added a... · 26aa2a6e
  Grant Douglas authored Mar 25, 2016
```
short project names result in unusable fuzz search UI elements, so added a min-width property to the css

Added a space between property colon and value to satisfy linter and pass build.
```
  26aa2a6e
- Merge branch 'fix-link-colors' into 'master' · 43e49f52
  Jacob Schatz authored Mar 25, 2016
```
Fix link colors after recent UI refactoring

cc @jschatz1 

See merge request !3404
```
  43e49f52
- Using class for specificity instead of tag. · d903465c
  Jacob Schatz authored Mar 25, 2016
  
  d903465c
- rescue Rugged::ReferenceError in Repository#gitlab_ci_yml method · 179bae99
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  179bae99
- For some reason this test fails without javascript so added it · 3dc0c3e4
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3dc0c3e4
- Make sure ci status colors are same and respected on most pages · 80c3cbfb
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  80c3cbfb
- Repository breadcrumbs and file header links should be dark · 02b585e9
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  02b585e9
- Fix link colors by using content-list for commits · 1853d715
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1853d715
- Make sure CI status icons have same color across all app · b5c9637c
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b5c9637c
- Don't attempt to look up an avatar in repo if repo directory does not exist · 50687897
  Stan Hu authored Mar 24, 2016
```
Closes #14580
```
  50687897
- Make sure Repository#gitlab_ci_yml is safe to use even when repository is missing · ed8e1faa
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ed8e1faa
- Small refactoring and rewording · 9e7e2c6b
  Dmitriy Zaporozhets authored Mar 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9e7e2c6b
- Merge branch 'clarify_lfs' into 'master' · 63c8a05b
  Achilleas Pipinellis authored Mar 25, 2016
```
Clarify LFS configuration

A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default.

See merge request !3388
```
  63c8a05b
- Upgrade Bullet to 5.0.0 · 8d2ded95
  connorshea authored Mar 24, 2016
```
Includes Rails 5 support. See changelog for details
(https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
```
  8d2ded95
- Describe CI stuff. · 28c94ee9
  Sytse Sijbrandij authored Mar 24, 2016
  
  28c94ee9
24 Mar, 2016 14 commits
- Remove release docs from the CE repository · 6abcb882
  Robert Speicher authored Mar 24, 2016
```
More detailed, updated, and accurate versions of these docs now live in
https://gitlab.com/gitlab-org/release-tools

[ci skip]
```
  6abcb882
- Merge branch 'issue_14610' into 'master' · 3028a7d2
  Robert Speicher authored Mar 24, 2016
```
Fix cancel button on issuable edit form

See merge request !3392
```
  3028a7d2
- Fix link when issuable is new · 35ef7ff6
  Alfredo Sumaran authored Mar 24, 2016
  
  35ef7ff6
- Fix cancel link on issuable edit form · 7f430490
  Alfredo Sumaran authored Mar 24, 2016
  
  7f430490
- Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences. · c3a98d8f
  Elias Werberich authored Mar 24, 2016
```
Fixes #14585.
```
  c3a98d8f
- Merge branch 'fix-comments-on-confidential-issues-show-activity-feed-for-non-members' into 'master' · 5a460c37
  Douwe Maan authored Mar 24, 2016
```
Comments on confidential issues doesn't show in activity feed to non-members

Closes #14568 

See merge request !3375
```
  5a460c37
- Rename `Event#proper?` to `Event#visible_to_user?` · 39a51f9e
  Douglas Barbosa Alexandre authored Mar 24, 2016
  
  39a51f9e
- Comments on confidential issues doesn't show in activity feed to non-members · 23956033
  Douglas Barbosa Alexandre authored Mar 24, 2016
  
  23956033
- Merge branch 'project-dropdown-width' into 'master' · 6b95be1d
  Jacob Schatz authored Mar 24, 2016
```
Fixed issue with width of project select dropdown

Before:

![Screen_Shot_2016-03-24_at_13.42.53](/uploads/25580c45dc339f7f932f032ac2d10fba/Screen_Shot_2016-03-24_at_13.42.53.png)

![Screen_Shot_2016-03-24_at_13.43.04](/uploads/e4d1d4e332d27f14c980264bef9dc4d9/Screen_Shot_2016-03-24_at_13.43.04.png)

After:

![Screen_Shot_2016-03-24_at_13.42.38](/uploads/68b8e161d86b41849f9e8a1d9c8fd36c/Screen_Shot_2016-03-24_at_13.42.38.png)

![Screen_Shot_2016-03-24_at_13.43.13](/uploads/f3fe732bcd517efea3a1d7c761bb6a0e/Screen_Shot_2016-03-24_at_13.43.13.png)

See merge request !3386
```
  6b95be1d
- Clarify LFS configuration · 2da8204f
  Drew Blessing authored Mar 24, 2016
  
  2da8204f
- Use head tree (cached) for file search. Also add some tests · b105b84e
  Dmitriy Zaporozhets authored Mar 24, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b105b84e
- Merge branch 'sidebar-bold-fix' into 'master' · c87adc4e
  Jacob Schatz authored Mar 24, 2016
```
Fixed bold in sidebar

![Screen_Shot_2016-03-23_at_12.01.54](/uploads/d50ae3426efcb2436b3debdd80073b2f/Screen_Shot_2016-03-23_at_12.01.54.png)

This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289

See merge request !3358
```
  c87adc4e
- Merge branch 'fix-password-settings-regressions' into 'master' · f565e126
  Jacob Schatz authored Mar 24, 2016
```
Shows password form when signed in with linked account

Closes #14379

Doing this to get the builds passing for !3325

See merge request !3381
```
  f565e126
- Detect build setup state based on gitlab_ci.yml presense · 3b1543cd
  Dmitriy Zaporozhets authored Mar 24, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3b1543cd