home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 22:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,941 Commits 48 Branches 340 Tags
c1921fb510d22e29ef30d084eca6cb079006a64e
Commit Graph
1257 Commits
Author SHA1 Message Date
Douwe MaanandRémy Coutable f30004819a 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 16:29:41 +01:00
Douwe MaanandRémy Coutable 7dddd45ebf 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-18 12:58:31 +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
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages 
Closes #11853
 2016-02-06 14:30:07 -05: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
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +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
Robert Speicher 8a85906a74 Merge branch 'support-akismet' into 'master' 
Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
 2016-02-03 01:26:30 +00:00
Jacob Vosmaer 15a1acb479 Merge remote-tracking branch 'origin/master' into git-raw-workhorse 2016-02-02 15:06:19 +01:00
Douglas Barbosa Alexandre 64c9768bd6 Use truncate helper on spam logs list 2016-02-02 11:25:44 -02:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02: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
Robert Speicher bbe0fa91d0 Prevent transient Capybara timeouts during feature tests 
The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.
 2016-01-28 20:56:49 -05: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
Dmitriy Zaporozhets 3f6bb7bc86 Merge branch 'issue_5546' into 'master' 
Save list sort in a cookie

Closes #5546 

See merge request !2537
 2016-01-28 16:21:04 +00:00
James Lopez afde800b25 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-group-500 2016-01-27 11:35:13 +01:00
James Lopez 5eb936dc31 moved and refactored feature based on feedback. Also updated CHANGELOG 2016-01-27 11:23:28 +01: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
James Lopez 89aeed183c feature and fix for 500 on group missing 2016-01-26 12:16:47 +01: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
Rubén Dávila c3c92c7317 Make default sorting preference work for Issues and MRs. 2016-01-22 18:43:21 -05:00
Rubén Dávila 9ef468922c Merge branch 'master' into issue_5546 2016-01-22 17:54:37 -05:00
Rubén Dávila 7c520c7803 Make sorting preference reusable for all projects. 2016-01-22 17:00:35 -05:00
Grzegorz Bizon b75f6c68e5 Add tests for clicking a row in build artifacts browser 2016-01-22 11:42:29 +01:00
Rubén Dávila 0f79620ccb Little refactor plus some specs. 2016-01-21 12:54:10 -05:00
Rémy Coutable 82571eab43 Fix failing specs 2016-01-21 10:08:12 +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