home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,025 Commits 48 Branches 340 Tags
7ea60c8564b18788990ce8b45decd0932d71ba6e
Commit Graph
682 Commits
Author SHA1 Message Date
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
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
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
James Lopez b1731adf43 workaround for forks with an invalid repo - avoid showing them in the list 2016-02-16 16:40:36 +01:00
Valery Sizov 719b588998 sporadic spec fix 2016-02-16 15:11:41 +02:00
Rémy Coutable 54613b6af5 Fix the "x of y" displayed at the top of Issuables' sidebar 
1. We now display the index of the current issuable among all its project's
issuables, of the same type and with the same state.
2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper
module.
3. Added acceptance specs for the sidebar counter.
 2016-02-15 15:40:24 +01:00
Stan Hu 46d35cdbe5 Add spinach tests for award emoji 2016-02-13 02:47:15 -08:00
Grzegorz Bizon 9e6190485b Parse XML instead of HTML in tests for a SVG build badge 2016-02-11 10:29:15 +01:00
Grzegorz Bizon debaa81329 Move build badge specs to badges directory 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 28b11963b1 Move builds badge implementation to new badges controller 2016-02-11 10:29:15 +01:00
Grzegorz Bizon d51e8e1b77 Inherit build badge access permissions from project 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 29f2600ab6 Improve build badge tests, add another test case 2016-02-11 10:29:14 +01:00
Grzegorz Bizon cf0eab5047 Add feature tests for builds status badge 2016-02-11 10:29:14 +01:00
Douglas Barbosa Alexandre 202bf71da8 Change MR link to "View Open Merge Request" 2016-02-10 10:47:59 -02:00
Douglas Barbosa Alexandre 1353cff5fe Replaces "Create merge request" link with one to the MR when one exists 2016-02-10 10:32:25 -02:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Kamil Trzcinski d231b6b918 Add behaviour tests for build permissions 2016-02-04 13:13:01 +01:00
Dmitriy Zaporozhets ccd99efe64 Update test after changes build page css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 22:48:21 +01:00
Jacob Vosmaer 15a1acb479 Merge remote-tracking branch 'origin/master' into git-raw-workhorse 2016-02-02 15:06:19 +01:00
Stan HuandRémy Coutable f86ddfd365 Render sanitized SVG images 
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
 2016-02-01 18:25:32 +01:00
Jacob Vosmaer 2679ec4066 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse 2016-02-01 11:33:36 +01:00
Phil Hughes 5a04fc9099 Added tests to emoji search field focus 2016-01-29 12:58:34 +00:00
Jacob Vosmaer 0197549d57 Cannot see a raw blob without workhorse 2016-01-28 18:09:52 +01:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Douwe Maan 8ab939c2c0 Merge branch 'ci/test-build-artifacts-scripts' into 'master' 
Add tests for clicking a row in build artifacts browser

This adds a feature tests for clicking a row, which is handled by javascript event.

/cc @ayufan 

See merge request !2551
 2016-01-26 13:32:00 +00:00
Jacob Schatz d3f24a2221 Adds base64 background search icon. 
All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own value.
 2016-01-24 20:20:03 -05:00
Grzegorz Bizon b75f6c68e5 Add tests for clicking a row in build artifacts browser 2016-01-22 11:42:29 +01:00
Rémy Coutable 8a829c9738 Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading 2016-01-20 22:42:07 +01:00
Dmitriy Zaporozhets 5ad60c5dda Merge branch 'secret-shortcut-feature' into 'master' 
Adds "t" as a shortcut for find file anywhere



See merge request !2507
 2016-01-20 16:39:43 +00:00
Douwe Maan b4faa59728 Merge branch 'issue_3749' into 'master' 
Update Issues/MRs updated_at field when notes are generated

Closes #3749 and #9130

See merge request !2493
 2016-01-20 15:06:49 +00:00
Jacob Schatz 106939fa2a Fixes test to not search whole page for content. 2016-01-20 01:52:01 -05:00
Rubén Dávila ed4934dbca Fix broken spec. 2016-01-20 00:17:21 -05:00
Rubén Dávila 99679bc6a0 Add specs for Forks listing. 2016-01-20 00:17:21 -05:00
Rémy Coutable 491c2248c0 Fix diff comments loaded by AJAX to load comment with diff in discussion tab 
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
  returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
 2016-01-19 18:22:01 +01:00
Douwe Maan f6e14431a0 Merge branch 'feature/expose-ci-lint-tool' 2016-01-19 11:52:20 +01:00
Rubén Dávila 78754cb1c9 Update Issues/MRs updated_at when user leaves comments. 2016-01-18 21:39:23 -05:00
Grzegorz Bizon 13f0ea12e3 Improve ux in builds artifacts browser 2016-01-18 19:58:16 +01:00
Grzegorz Bizon 6fe33804dc Remove dropdown containing CI Lint button on builds page 
Link to CI Lint on builds page will be a separate button from now on.
 2016-01-18 08:12:31 +01:00
Grzegorz Bizon d9629a0cf0 Add specs for CI Lint button exposed on a builds page 2016-01-17 16:57:42 +01:00
Grzegorz Bizon 6a504c8256 Add feature tests for permissions for build artifacts read ability 2016-01-15 13:56:43 +01:00
Grzegorz Bizon b7bb56c7a3 Expand builds namespace for feature tests in spinach 2016-01-15 13:09:20 +01:00
Douglas Barbosa Alexandre aac6598482 Relax constraints for wiki slug 
Since GitHub doesn’t apply these constraints to theirs wiki slug
allowing characters like `,`, `:`, `*`, etc, we need to relax our
constraints or some wiki pages will not be available after they were
imported.

For an example the Devise project have a wiki page with the following
slug: “How To: Add sign_in, sign_out, and sign_up links to your layout
template”
 2016-01-14 12:09:31 -02:00
Grzegorz Bizon 6b0a43aff3 Improve readability of artifacts browser Entry related code 2016-01-14 12:48:17 +01:00
Grzegorz Bizon 6d7a77074f Add specs for endpoint meant to be accelerated by workhorse 2016-01-14 12:48:16 +01:00
Grzegorz Bizon cde455c4e6 Add encoding feature tests for builds artifacts browser 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 09c82c6fdc Add spinach feature specs for build artifacts browser 2016-01-14 12:48:15 +01:00
Grzegorz Bizon e5d2a81b86 Add basic spinach tests for project builds 2016-01-14 12:48:15 +01:00
Rémy Coutable 5e452d3794 Improve & adds specs for Issue/MR references 
- Improve specs for private Issue/MR referenced in public Issue
- Add specs for private Issue/MR referenced in public MR
 2016-01-13 17:05:54 +01:00
Rémy Coutable 9d7f88c122 Show referenced MRs & Issues only when the current viewer can access them 2016-01-13 11:59:10 +01:00