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
25,906 Commits 48 Branches 340 Tags
7b2af8740dfa080bcb880fef64de4b99e2255dd4
Commit Graph
13323 Commits
Author SHA1 Message Date
Phil Hughes 0a7974e584 Fixed issue with notification settings not saving 
Closes #14736
 2016-03-30 08:40:44 +01:00
Rémy Coutable 4a4398560c Merge branch 'added-milestone-upcoming' into 'master' 
Dropdown bug fixes

- Added back upcoming to milestone filter

![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png)

- Fixed bug that would cause the currently selected value to disappear on filters
- Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past

Closes #14536

See merge request !3368
 2016-03-30 06:49:04 +00:00
Robert Speicher f7d20a6f76 Merge branch 'fix-mr-comment-commit-pruned' into 'master' 
Gracefully handle notes on deleted commits in merge requests

Closes #3250

See merge request !3402
 2016-03-29 20:25:12 +00:00
Robert Speicher a9f5df384e Merge branch 'fix_wip_in_mr_api' into 'master' 
Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432
 2016-03-29 18:49:08 +00:00
Robert Speicher b1f924c165 Merge branch 'handle-nil-description-slack-message' into 'master' 
Handle nil descriptions in Slack issue messages

Closes #14676

See merge request !3420
 2016-03-29 16:30:55 +00:00
Phil Hughes 31fea92295 Updated based on Ruby feedback 2016-03-29 15:26:12 +01:00
Phil Hughes b5ece0886a Ruby fixes 2016-03-29 12:19:09 +01:00
Phil Hughes 35b3c7096d Fixed multiselect 2016-03-29 12:17:22 +01:00
Phil Hughes f8b5ff9520 Fixed rubocop issues 2016-03-29 11:59:42 +01:00
Phil Hughes f3b162a9ac Fixed issue with milestone not being un-selectable 2016-03-29 11:59:42 +01:00
Phil Hughes 88024b17c0 Standardised the output of the JSON to always include the name 
The frontend will then always use the name as the ID - like previous
 2016-03-29 11:59:13 +01:00
Phil Hughes 3aeda8c94f Removed un-used code 2016-03-29 11:58:11 +01:00
Phil Hughes a6d7c69521 Updated to only include upcoming on filters 
Fixes tests
 2016-03-29 11:58:11 +01:00
Phil Hughes 7ff6af19cc Dropdown bug fixes 
Added back upcoming to milestone filter
Fixed bug that would cause the currently selected value to disappear on filters
Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
 2016-03-29 11:57:04 +01:00
Rémy Coutable 00726e4df9 Merge branch 'fix/nomethod-error-on-ci' into 'master' 
Fix error when visiting CI root path

Closes #14528, closes #14687

See merge request !3377
 2016-03-29 10:32:38 +00:00
Marin Jankovski af8df7e598 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-03-29 11:52:56 +02:00
Douwe Maan 98fbde5422 Merge branch 'rs-remove-wip-tabindex' into 'master' 
Remove tabstop from the WIP toggle links

[ci skip]

See merge request !3426
 2016-03-29 08:21:59 +00:00
Douwe Maan a7ca8689f7 Merge branch 'fix-14607' into 'master' 
Ensure private project snippets are not viewable by unauthorized people

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607

See merge request !1946
 2016-03-29 08:21:48 +00:00
Grzegorz Bizon b7685b57d3 Redirect to root path when visiting /ci 2016-03-29 08:04:17 +02:00
Abhi Rao 762d6ab4fd Ensuring Merge Request API returns boolean values for work_in_progress 
Fixes #14692
 2016-03-28 22:11:44 -05:00
Jacob Schatz 828ad5f68f Merge branch 'fix-dropdown-item-height' into 'master' 
Fix dropdown line height

**Before**

![Screen_Shot_2016-03-28_at_5.54.37_PM](/uploads/67681da80b9104924083f13af3833553/Screen_Shot_2016-03-28_at_5.54.37_PM.png)

**After**

![Screen_Shot_2016-03-28_at_5.57.37_PM](/uploads/5df14c2d131cc88dbc75b87959f56c3c/Screen_Shot_2016-03-28_at_5.57.37_PM.png)


See merge request !3431
 2016-03-29 01:45:15 +00:00
Jacob Schatz f734f49520 Merge branch 'fix_rightsidebar_overlapping_build_section' into 'master' 
Fix right sidebar overlapping build section in merge request

closes #14608 

![build](/uploads/d1902f5fa335274c92ac1b1a8193466f/build.gif)


See merge request !3415
 2016-03-29 01:26:21 +00:00
Alfredo Sumaran 7b8a4dd351 Set properly line heights 2016-03-28 17:57:59 -05:00
Jacob Schatz 795199bf04 Merge branch 'add_link_to_fork_counter_button' into 'master' 
Add link to forks pages in fork counter button

closes #14412 

![fork_link](/uploads/5afef05bc592b0cf1c90ae4d154aed87/fork_link.gif)

See merge request !3387
 2016-03-28 21:46:56 +00:00
Robert Speicher 8406318d87 Remove tabstop from the WIP toggle links 
[ci skip]
 2016-03-28 17:04:27 -04:00
Dmitriy Zaporozhets 55df9a70bf Merge branch 'functional-sidebar' into 'master' 
Updates sidebar to use new dropdowns for issues and merge requests

Fixes #12935, #13164 

See merge request !3175
 2016-03-28 20:59:13 +00:00
Jacob Schatz 5449296fd6 Fix small style issue 2016-03-28 15:49:21 -04:00
Alfredo Sumaran 9e0890790f Remove background 
Fixes note's action bar background color when note is highlighted
 2016-03-28 13:59:19 -05:00
Stan Hu 191b9e3f05 Gracefully handle notes on deleted commits in merge requests 
Closes #3250
 2016-03-28 07:43:42 -07:00
Stan Hu 2fa20f2d4f Handle nil descriptions in Slack issue messages 
Closes #14676
 2016-03-28 04:15:41 -07:00
Dmitriy Zaporozhets 0f00a75df0 Dont use small font size for commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:38:06 +02:00
Dmitriy Zaporozhets ef4ca663fd Use standard button size for new file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:34:29 +02:00
Dmitriy Zaporozhets 3bb47bb6e0 Fix vertical align for files tab top navigation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:31:48 +02:00
Dmitriy Zaporozhets 6e86ef8452 Add border bottom and margin for readme holder 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:26:45 +02:00
Alfredo Sumaran 5f6166a256 Fix cancel link 2016-03-28 01:35:53 -05:00
Arinde Eniola feee6dab10 fix right sidebar overllaping build section in merge request 2016-03-27 16:33:51 +01:00
Stan Hu c1834664a7 Merge branch 'handle-avatar-in-empty-repo' into 'master' 
Don't attempt to look up an avatar in repo if repo directory does not exist

Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/

Closes #14580



See merge request !3390
 2016-03-27 00:21:57 +00:00
Jacob Schatz 8034e1a154 Merge branch 'feature/fuzz-search-min-width' into 'master' 
Fuzzy search dropdown UI element min-width (issue 14644)

Short project names sometimes result in an unusable fuzzy search UI element. Therefore, I added a min-width CSS property with a value of 175px.

See here for details but it's fairly straight forward:
https://gitlab.com/gitlab-org/gitlab-ce/issues/14644

Before:
<br />
![Screen_Shot_2016-03-25_at_20.03.54](/uploads/2bdc048bd818cdcd228bb2d19a10b5d2/Screen_Shot_2016-03-25_at_20.03.54.png)

After:
<br />
![Screen_Shot_2016-03-25_at_20.19.29](/uploads/be23938757f67ffebb96c9bdc8229c5b/Screen_Shot_2016-03-25_at_20.19.29.png)

See merge request !3407
 2016-03-26 23:11:48 +00:00
Jacob Schatz 88007c3d77 Update, so filtering works properly. 
Bulk update works as well
 2016-03-26 09:30:37 -04:00
Dmitriy Zaporozhets ea8bd204e3 Merge branch 'feature--preferences-dashboard-groups' of https://gitlab.com/eliasw/gitlab-ce 2016-03-26 11:08:48 +01:00
Dmitriy Zaporozhets 2fdf928afa Merge branch 'ci-setup-info' into 'master' 
Add links to CI setup documentation from project settings and builds pages

For #14483 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3384
 2016-03-26 09:57:47 +00:00
Grant Douglas 26aa2a6e67 short project names result in unusable fuzz search UI elements, so added a min-width property to the css 
Added a space between property colon and value to satisfy linter and pass build.
 2016-03-25 21:21:44 +00:00
Jacob Schatz 07d87d15f0 Fix filter so it works with new multi select drop-downs. 2016-03-25 16:42:28 -04:00
Rémy Coutable 4f07c0a107 Ensure project snippets have their own access level 2016-03-25 18:51:17 +01:00
Jacob Schatz d903465c25 Using class for specificity instead of tag. 2016-03-25 13:16:10 -04:00
Dmitriy Zaporozhets 179bae9968 rescue Rugged::ReferenceError in Repository#gitlab_ci_yml method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 17:54:57 +01:00
Jacob Schatz 1445bfa18d Use hidden inputs instead of data-selected 2016-03-25 12:44:33 -04:00
Dmitriy Zaporozhets 80c3cbfb1d Make sure ci status colors are same and respected on most pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:55:08 +01:00
Dmitriy Zaporozhets 02b585e924 Repository breadcrumbs and file header links should be dark 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:48:00 +01:00
Dmitriy Zaporozhets 1853d71543 Fix link colors by using content-list for commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:40:51 +01:00