Commit Graph
12080 Commits
Author SHA1 Message Date
Tomasz Maczukin 2ef196deb2 Change interpolation to named placeholder in owned_or_shared scope 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 128be3c010 Add basic runners management API
- add feature to list runners
- add feature to show runners details
- add feature to delete runner
- add feature to update runner
2016-02-19 13:18:46 +01: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
heiko 9242b9e561 number_with_delimiter() added 2016-02-19 00:52:18 +00:00
Robert Speicher 924463907d Allow ProjectTeam#human_max_access to return "Owner" 2016-02-18 16:39:59 -05: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
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 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
Patricio Cano f014127e17 Decouple SAML authentication from the default Omniauth logic 2016-02-18 13:22:19 -05:00
Jacob Schatz 71795b9ae8 Uses cross browser niceScroll to do scrolling on sidebar. 2016-02-18 10:55:30 -05: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
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
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 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
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
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
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
James Lopez 4b650fac76 updated fix based on MR feedback 2016-02-17 18:05:40 +01:00
James Lopez dd68d100e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-forks-page 2016-02-17 17:53:24 +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
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
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
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
James Lopez 5255a54df9 refactored some stuff based on MR feedback 2016-02-17 10:42:59 +01: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