Commit Graph
23993 Commits
Author SHA1 Message Date
Phil Hughes 7952fec633 Award emoji supports retina displays 2016-02-19 11:15:58 +00:00
Douwe Maan a33b63b7d4 Merge branch '12791-hide-project-limit-reached-warning' into 'master'
Project limit is reached warning is hidden when the projects_limit is zero

Fixes #12791

See merge request !2890
2016-02-19 09:00:36 +00:00
Zeger-Jan van de Weg 8dc8006918 Project limit is reached warning is hidden when the projects_limit is zero
Fixes #12791
2016-02-19 09:27:43 +01:00
Douwe Maan ad12f11f3e Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness 

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
2016-02-19 08:11:02 +00:00
Douwe Maan cb0b7de482 Merge branch 'fix/project-forks-page' into 'master'
workaround for forks with an invalid repo

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

The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. 

With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem...

Also fixing Sentry issue: 1180
`undefined method 'already_forked?' for nil:NilClass `


See merge request !2836
2016-02-19 08:00:58 +00:00
Douwe Maan c58a02e82f Merge branch 'rs-show-owner-label' into 'master'
Allow `ProjectTeam#human_max_access` to return "Owner"



See merge request !2881
2016-02-19 07:50:05 +00:00
James Lopez f3b6839a4a update based on feedback 2016-02-19 08:09:20 +01:00
Robert Speicher a8b32b1e60 Merge branch 'patch-1' into 'master'
number_with_delimiter() added

See merge request !2886
2016-02-19 04:04:14 +00:00
heiko 9242b9e561 number_with_delimiter() added 2016-02-19 00:52:18 +00:00
Robert Speicher ea4d2741a2 Merge branch 'patch-1' into 'master'
Bug found by Charles Sibbald at Sky.

Calls with patricio and Jacob confirmed this.

[ci skip]

See merge request !2877
2016-02-18 21:52:09 +00:00
Robert Speicher ca324c2fe4 Merge branch 'patch-1' into 'master'
No changes to nginx config in this update. Removed unnecessary instructions.

[ci skip]

See merge request !2879
2016-02-18 21:48:47 +00:00
Douwe Maan 1d8f1d25b7 Merge branch 'revert-2782' into 'master'
Revert "Merge branch 'saml-decoupling' into 'master'"

This reverts commit c04e22fba8, reversing
changes made to 0feab326d5.

Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2782

See merge request !2878
2016-02-18 21:46:48 +00:00
Robert Speicher 924463907d Allow ProjectTeam#human_max_access to return "Owner" 2016-02-18 16:39:59 -05:00
Brandon Patton 9425c29ad7 No changes to nginx config in this update. Removed unnecessary instructions. 2016-02-18 21:19:31 +00:00
Douwe Maan 873b0db220 Revert "Merge branch 'saml-decoupling' into 'master' "
This reverts commit c04e22fba8, reversing
changes made to 0feab326d5.
2016-02-18 22:14:53 +01:00
Douwe Maan 6524fbeaba Merge branch 'rs-sentry-release-tracking' into 'master'
Add release tracking for Sentry



See merge request !2863
2016-02-18 21:10:35 +00:00
Robert Speicher c04e22fba8 Merge branch 'saml-decoupling' into 'master'
Decouple SAML authentication from the default Omniauth logic

Fixes gitlab-org/gitlab-ee#178

With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118

See merge request !2782
2016-02-18 19:46:35 +00:00
Robert Speicher 0feab326d5 Merge branch 'cache-clear' into 'master'
Use SCAN during 'rake cache:clear'

This allows 'rake cache:clear' to delete millions of keys without
choking. It requires Redis 2.8.0 or newer but we needed that already
anyway.

See merge request !2872
2016-02-18 19:38:00 +00:00
Robert Speicher 94a0a00f40 Merge branch 'autocrlf-lazy' into 'master'
Only set autocrlf when creating/updating files

Related issue: gitlab-org/gitlab-ce#13457
Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495

See merge request !2859
2016-02-18 19:07:13 +00:00
Richard Pidgeon 5d2530f069 bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this 2016-02-18 18:58:51 +00:00
Jacob Vosmaer 977fdbe830 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into cache-clear 2016-02-18 19:51:58 +01:00
Patricio Cano f014127e17 Decouple SAML authentication from the default Omniauth logic 2016-02-18 13:22:19 -05:00
Dmitriy Zaporozhets 7f7eef2aef Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master'
Uses cross browser niceScroll to do scrolling on sidebar.

Fixes: #13544 

Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. 

This also leaves the default scrollbar as is. 

![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png)

Also fixes horz scroll issue: 

![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png)

cc @creamzy @dzaporozhets 

See merge request !2873
2016-02-18 16:42:05 +00:00
Jacob Schatz 71795b9ae8 Uses cross browser niceScroll to do scrolling on sidebar. 2016-02-18 10:55:30 -05:00
Jacob Vosmaer 9805fe1914 Use SCAN during 'rake cache:clear'
This allows 'rake cache:clear' to delete millions of keys without
choking. It requires Redis 2.8.0 or newer but we needed that already
anyway.
2016-02-18 16:55:19 +01:00
Kamil Trzciński c0f549a95b Merge branch 'fix/ci-first-job-allow-failure' into 'master'
Fix CI builds scheduler when first build in stage is allowed to fail

This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail.

Closes #3192

See merge request !2869
2016-02-18 14:28:25 +00:00
Yorick Peterse 5b6d347fcd Handle raw_repository returning nil in exists?
If path_with_namespace is nil Repository#raw_repository will also return
nil. Apparently code out there creates a Repository instance without a
namespace path. Right.
2016-02-18 14:19:35 +01:00
Grzegorz Bizon bee26f9c4e Add specs covering bug in build allowed to fail case 2016-02-18 14:08:50 +01:00
Kamil Trzciński c943dae6c1 Merge branch 'rs-git-fetch-labels' into 'master'
Fix labels for git clone/git fetch Project CI setting



See merge request !2842
2016-02-18 12:37:35 +00:00
Kamil Trzciński b352dbaba6 Merge branch 'patch-1' into 'master'
Add example of creating build artifacts only for release tags.



See merge request !2649
2016-02-18 12:24:54 +00:00
Yorick Peterse 19b21c2e0c Use Repository#exists? in Repository#commit?
Just checking raw_repository is no longer accurate to determine if a
repository exists or not.
2016-02-18 13:22:44 +01:00
Yorick Peterse 8a7aad770c Added specs for Repository#exists? 2016-02-18 12:28:47 +01:00
Yorick Peterse 54aa0969d4 Fixed Repository#exists? to handle errors
Now that Repository#raw_repository no longer sets the autocrlf option it
will also no longer raise any NoRepository errors since it doesn't
access Rugged any more. This also means that Repository#exists? can't
simply return the raw repository as this is no indication of whether or
not the repository actually exists (besides returning a non boolean is
weird in the first place).

To solve this problem Repository#exists? now properly checks if the
repository exists and returns true/false instead of a
Gitlab::Git::Repository or nil object.
2016-02-18 12:19:49 +01:00
Grzegorz Bizon 52d5eefd1f Add Changelog entry for builds scheduler fix 2016-02-18 12:05:40 +01:00
Grzegorz Bizon 8114786665 Fix builds scheduler when first build is allowed to fail
Before this fix when there was only one relevant, previous build and it
failed, but was allowed to fail, entire build had been marked as
skipped.

Closes #3192
2016-02-18 11:50:11 +01:00
Yorick Peterse c475b17111 Only set autocrlf when creating/updating files
Setting the "autocrlf" Git option is an overkill since it's rarely
actually needed. More importantly, it has quite the impact on
performance (see gitlab-org/gitlab-ce#13457 for more information).

By setting "autocrlf" when creating or updating files we guarantee the
option is always set properly when we actually need it _without_
introducing overhead for requests that have nothing to do with this
option.

Fixes gitlab-org/gitlab-ce#13457
2016-02-18 11:46:05 +01:00
Grzegorz Bizon 0ae7c95453 Add specs for build status helper class 2016-02-18 10:52:57 +01:00
Rémy Coutable 8b918267c7 Merge branch 're-add-missing-part-in-update-doc' into 'master'
Re-add section about NGINX config and init script updates in 8.4->8.5 update doc

These sections were removed by !2766 but:
- even if the NGINX config wasn't modified, it might
  be in future updates so it's better to always have
  it instead of having to remember to add it depending
  on the changes
- the init script update section must be there since
  it's a safe command line that should be run on every update

This fixes https://github.com/gitlabhq/gitlabhq/issues/10031.

/cc @rspeicher @yorickpeterse 

See merge request !2815
2016-02-18 09:41:58 +00:00
Douwe Maan 52a8d1f3c6 Merge branch 'fix/gitpushservice-complexity-issue' into 'master'
Reduce code complexity on GitPushService#execute

Code complexity for gitlab-ce after this has been refactored:
```
  27.3: GitPushService#execute
```
This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that?

I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles.

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


See merge request !2784
2016-02-18 09:33:21 +00:00
Grzegorz Bizon 364072b7d0 Return a builds array in builds create service 2016-02-18 10:29:20 +01:00
Dmitriy Zaporozhets 27b732abb1 Merge branch 'rs-update-unicorn' into 'master'
Bump unicorn to `~> 4.9.0`

Closes #2820 

See merge request !2843
2016-02-18 08:49:36 +00:00
Robert Speicher 90a6783d0a Merge branch 'issue_13539' into 'master'
Reopened MRs should also be considered as open.

Fixes #13539 

See merge request !2866
2016-02-18 06:21:58 +00:00
Rubén Dávila 2770de9617 Reopened MRs should also be considered as open. 2016-02-17 21:15:13 -05:00
Robert Speicher 20fcc5d6f6 Update Emoji sprite and its SCSS for new styles 2016-02-17 19:01:25 -05:00
Achilleas Pipinellis 66c03e0e29 Merge branch 'sqlite_rm_rf' into 'master'
Remove remaining sqlite method call

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

See merge request !2862
2016-02-17 19:21:05 +00:00
Robert Speicher 6c9ae675b5 Add release tracking for Sentry 2016-02-17 14:05:58 -05:00
Achilleas Pipinellis e5f9c4460f Remove remaining sqlite method call 2016-02-17 20:34:54 +02:00
James Lopez c110c9bd7f refactored spec 2016-02-17 18:29:43 +01:00
Douwe Maan ff28ac9c18 Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master'
Add ability to see and sort on vote count from Issues and MR lists

Fixes #3763

* Sort options

![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png)

* Most popular

![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png)

* Least popular

![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png)

See merge request !2781
2016-02-17 17:20:35 +00:00
Douwe Maan 879d66b6ab Merge branch 'git-archive-refactor' into 'master'
Refactor 'git archive' hand-off to gitlab-workhorse

We have a nicer way now to hand off HTTP responses to gitlab-workhorse.

Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36

See merge request !2675
2016-02-17 17:16:34 +00:00