Commit Graph
23943 Commits
Author SHA1 Message Date
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
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
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
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
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
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
Rémy Coutable a4ffdf922d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-02-17 17:33:09 +01:00
Rémy Coutable be4cdd9344 Merge branch 'bugfix/jschatz1/milestone-icon' into 'master'
Correct icon for milestones.



See merge request !2856
2016-02-17 16:21:08 +00:00
Douwe Maan 14488f79b5 Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' into 'master'
Sort line notes used in parallel diff by created_at


Fixes #13464.

See merge request !2858
2016-02-17 15:57:34 +00:00
Douwe Maan 6483a4c7b1 Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master'
Redirect /import to project page if no importing at all and repo exists


Fixes gitlab-org/gitlab-ce#13367.

See merge request !2857
2016-02-17 15:52:35 +00:00
Rémy Coutable 42c2064a36 Sort line notes used in parallel diff by created_at
Fixes #13464.
2016-02-17 16:31:14 +01:00
Jacob Vosmaer 64d8a38b54 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 15:25:57 +01:00
Jacob Vosmaer b3bd7c1999 Add newline 2016-02-17 15:22:33 +01:00
Douwe Maan 28d42a33f3 Merge branch 'rs-issue-13469' into 'master'
Handle nil commits in Gitlab::PushDataBuilder.build

Closes #13469

See merge request !2825
2016-02-17 14:19:20 +00:00
Douwe Maan f7ee31a2c3 Merge branch 'expire-fork-import-caches' into 'master'
Expire caches after forking/importing a repository

cc @dblessing @DouweM 

Related issue: gitlab-org/gitlab-ce#13505

See merge request !2838
2016-02-17 14:07:54 +00:00
Douwe Maan cb2591e83f Merge branch 'image-diff' into 'master'
Fixes for showing images

- Render scrubbed SVG's inline, not via /raw/
- Use /raw/ requests on image diffs

Both of these are needed because of no longer eager loading blobs.

This a follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2830

Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/13350

See merge request !2837
2016-02-17 14:06:10 +00:00
Rémy Coutable 3d3ac87af9 Redirect /import to project page if no importing at all and repo exists
Fixes #13367.
2016-02-17 15:05:44 +01:00
Jacob Schatz 16e116bc16 Correct icon for milestones. 2016-02-17 09:02:34 -05:00
Douwe Maan 534d480993 Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' into 'master'
Fix a bug preventing from doing subsequent edits in any Issuable sidebar

Fixes #13517. Fixes #12572.

### Issue

![impossible-subsequent-issue-edits-in-sidebar](/uploads/bd45c0effb46848641932d9cd38d3fe2/impossible-subsequent-issue-edits-in-sidebar.gif)

---

### Merge request

![impossible-subsequent-mr-edits-in-sidebar](/uploads/b4e1e3e93df4ac0a3d962df8b6139de9/impossible-subsequent-mr-edits-in-sidebar.gif)

/cc @jschatz1 @sytses 

See merge request !2848
2016-02-17 14:01:30 +00:00
Douwe Maan 522eb17923 Merge branch 'klowner/gitlab-ce-fix-compare-by-tag-crash' into 'master'
Fix 500 error when comparing by tags

_Originally opened at !2787 by @klowner._

- - -

Fixes #13171.
Fixes #13370.

See merge request !2849
2016-02-17 14:00:58 +00:00
Douwe Maan cbb45195e8 Merge branch 'bugfix/jschatz1/sidebar/02-16-16' into 'master'
Fix double scrollbar issues

Sidebar double scrollbar issue fix.

![Screen_Shot_2016-02-16_at_9.22.49_PM](/uploads/cb950eda08ed5d3b4a6c6979c977e029/Screen_Shot_2016-02-16_at_9.22.49_PM.png)

See merge request !2851
2016-02-17 13:59:39 +00:00
Douglas Barbosa Alexandre 9823d00e0b Add ability to see and sort on vote count from Issues and MR lists 2016-02-17 11:32:02 -02:00
Jacob Vosmaer 3d9f8ab3b5 Use gitlab-workhorse 0.6.5 2016-02-17 14:20:49 +01:00
Mark RiedeselandRémy Coutable e9e01bcd96 Fix 500 error when comparing by tags 2016-02-17 12:56:53 +01:00
Jacob Schatz 29bfdf88ea Fix double scrollbar issues 2016-02-17 06:37:21 -05:00
Jacob Schatz 943bed68bc Merge branch 'issue_13359' into 'master'
Prevents floated button group on issues view

Issue #13359 

![screenshot](/uploads/962ac4f3f1f3d6ef87f7152c09090801/screenshot.jpg)

See merge request !2826
2016-02-17 11:30:26 +00:00
Yorick Peterse b1203108b0 Flush all repository caches when deleting a repo
This ensures that _all_ caches (including any caches normally only
flushed under certain conditions) are flushed whenever a project is
removed. Because cache keys are based on project namespaces (excluding
IDs) not doing so could result in a newly created project re-using old
caches (if the project was re-created using the same name).
2016-02-17 11:38:18 +01:00
Yorick Peterse a9e0301c23 Expire caches after forking/importing a repository
This ensures the caches for Repository#empty? and
Repository#has_visible_content? are flushed after a repository has been
imported or forked.

Fixes gitlab-org/gitlab-ce#13505
2016-02-17 11:38:18 +01:00
Jacob Vosmaer a0ccb0731b Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 11:30:42 +01:00
Jacob Vosmaer a87fe2a472 Fixes requested by Rémy 2016-02-17 11:08:47 +01:00
Jacob Vosmaer 016367c640 No use to sanitize partial blob data 2016-02-17 11:08:10 +01:00
Yorick Peterse 300e16065a Merge branch 'update-allocations' into 'master'
Updated the allocations Gem to 1.0.4

Sometimes the output of Allocations.to_hash may contain garbage. See
https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce
for more information.

See merge request !2816
2016-02-17 09:59:53 +00:00
James Lopez 5255a54df9 refactored some stuff based on MR feedback 2016-02-17 10:42:59 +01:00
Douwe Maan b4e72516f3 Merge branch 'spec_fix' into 'master'
[Award Emoji]: sporadic spec fix



See merge request !2833
2016-02-17 09:19:55 +00:00
Rémy Coutable c569f8b480 Fix a bug preventing from doing subsequent edits in any Issuable sidebar 2016-02-17 10:17:57 +01:00
Robert Speicher 594d21cdca Bump unicorn to ~> 4.9.0 2016-02-16 18:15:06 -05:00
Robert Speicher 4c3fe9e104 Merge branch 'doc-ci-variables-readme-fix' into 'master'
fix table in doc/ci/variables/README.md

The table was missing a column separator, causing GitLab to render the
markdown incorrectly.

[ci skip]

See merge request !2840
2016-02-16 21:00:00 +00:00
Richard Hansen 458e3c7167 fix table in doc/ci/variables/README.md 2016-02-16 15:02:18 -05:00
Achilleas Pipinellis b274a1248d Merge branch 'redis_installation' into 'master'
Fix Redis installation guide



See merge request !2839
2016-02-16 19:34:44 +00:00
Achilleas Pipinellis 9ae4fa943e Fix Redis installation guide
[ci skip]
2016-02-16 21:32:22 +02:00
Jacob Vosmaer 24fa458615 Use /raw/ requests for image diffs 2016-02-16 17:29:45 +01:00
Alfredo Sumaran 6d80a4c4f9 Wrap issue details to prevent content misalignment 2016-02-16 11:06:15 -05:00
Jacob Vosmaer 15126fc70f Fix SVG blob rendering 2016-02-16 17:01:25 +01:00
Jacob Schatz 7cc4b73942 Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master'
Sidebar fixes

Fixes #13215 

* when editing a dropdown, but not changing anything you end up in an ugly state
* the hover-over state for the subscribe and other buttons are veeery subtle
* the collapse button needs some sort of hover-over state
* the reference gets shortened. It always got shortened. Not an issue with this in particular.
* the minimized sidebar is not functional. The copy button doesn't do anything
* looks all funky in safari (not for me)

See merge request !2736
2016-02-16 15:52:07 +00:00