home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,611 Commits 48 Branches 340 Tags
3be20afa9f7bfb4e4d13b30d5cfcd304b79ea478
Commit Graph
701 Commits
Author SHA1 Message Date
Douwe Maan a297e44048 Merge branch 'issue_13621' into 'master' 
Don't repeat labels listed on Labels tab.

Fixes #13622 

See merge request !2924
 2016-02-29 13:16:00 +00:00
Dmitriy Zaporozhets 820d227b9e Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' 2016-02-25 19:02:57 +01:00
Robert Speicher dba47f680d Merge branch 'issue_13301_emoji-menu' into 'master' 
Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888
 2016-02-24 02:50:45 +00:00
Annabel Dunstone 476a804969 Update award_emoji test 2016-02-23 19:37:15 -06:00
Jacob Schatz 1142b327e8 Merge branch 'dz-small-ui-fixes' into 'master' 
Set of UI fixes

* Improve wiki pages
* Improve profile pages

cc @skyruler 

See merge request !2758
 2016-02-23 15:38:20 +00:00
Rémy Coutable f36fde94d0 Add a spec for coverage indicator in project's builds list 2016-02-22 19:34:35 +01:00
Rubén Dávila 3d96bfaa8a Don't repeat labels listed on Labels tab. 2016-02-22 13:17:38 -05:00
Phil Hughes 62f4a9de19 Users don't get instructions to push to other users empty projects 
Fixes #12518
 2016-02-22 17:37:26 +00:00
Phil Hughes 51c17329a4 Fixed failing issues tests 
Removed up/down vote icons from merge requests. Was missed from d8069bd858
 2016-02-22 11:35:52 +00:00
Jacob Schatz de84fa365e Merge branch 'issue_3276' into 'master' 
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
 2016-02-19 19:44:13 +00:00
Rubén DávilaandRobert Speicher 87b076f2ce Add some spinach specs 2016-02-19 13:14:55 -05:00
Grzegorz BizonandGrzegorz Bizon 6ca99bd899 And CI API endpoint where user can erase a build 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c850ceec5d Create method that checks if build has been erased 
+ minor improvements
 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon ede451c851 Show information indicating that build has been erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon bd7c52c734 Add feature specs for build erase button 2016-02-19 17:24:59 +01:00
Annabel Dunstone b80df08735 Add timeout for ajax call in award emoji steps; update focus in award picker 2016-02-19 07:32:20 -06: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
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
Dmitriy Zaporozhets 465d187927 Fix spinach test for wiki markdown render 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-13 21:58:07 +02: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
Dmitriy Zaporozhets c466f389fa Update tests to match new wiki header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-09 00:56:45 +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
Rubén Dávila d618e9c8f8 Add specs. 2016-02-02 17:47:18 -05: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