home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,759 Commits 48 Branches 340 Tags
28bee175dbdba8bb0ca04887d6f8d5c4d727a0bd
Commit Graph
24759 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 28bee175db Merge branch 'issue_2805' into 'master' 
Upgrade carrierwave to 0.10.0.

Closes #2805 

See merge request !3084
 2016-03-05 14:48:36 +00:00
Dmitriy Zaporozhets 14df110b78 Merge branch 'issue-sidebar-mobile' into 'master' 
Issue sidebar mobile

Fixes #13592 
Fixes #14037 

See merge request !3050
 2016-03-05 11:48:21 +00:00
Sytse Sijbrandij efe7a6b04c No options please. 2016-03-04 18:23:55 -08:00
Robert Speicher 0c7626f3a5 Merge branch 'rs-frontmatter-pre' into 'master' 
Properly display YAML front matter in Markdown

See merge request !3072
 2016-03-05 00:17:58 +00:00
Douwe Maan 2f6ded6df9 Merge branch 'rs-no-default-credentials' into 'master' 
Allow the initial admin to set a password

Closes #1980

See merge request !3068
 2016-03-04 23:48:56 +00:00
Robert Speicher 8eaeda0816 Add YamlFrontMatterFilter to the PreProcessPipeline 
This filter will detect YAML Front Matter and convert it to an HTML
table for prettier formatting.
 2016-03-04 18:05:48 -05:00
Robert Speicher 599a6d7873 Allow the initial admin to set a password 
Closes #1980
 2016-03-04 17:37:57 -05:00
Douwe Maan 92d896183b Merge branch 'rs-organize-factories' into 'master' 
Factory cleanup

Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/5880

See merge request !2847
 2016-03-04 22:27:56 +00:00
Douwe Maan e7c4c22cc1 Merge branch 'rs-update_merge_request' into 'master' 
Move `update_merge_request` ability to Developer

Closes #13663

See merge request !3099
 2016-03-04 22:26:09 +00:00
Douwe Maan 925da3fdf8 Merge branch 'rs-wiki-pipeline-spec' into 'master' 
Add a spec for WikiPipeline

Removes the specs from GollumTagsFilter that were more like integration
tests for the pipeline than unit tests of the filter.

See merge request !3054
 2016-03-04 21:19:11 +00:00
Douwe Maan 3231ea10b7 Merge branch 'fix/sentry-1182' into 'master' 
In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today

For some reason, GoogleBot accesses `/u/:username/calendar_activities` without
a `:date` param, but then the view was trying to call `#to_s(:short)` which
doesn't exist on `nil`, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/

See merge request !3074
 2016-03-04 20:59:58 +00:00
Robert Speicher e6204eb3cb Move update_merge_request ability to Developer 
Closes #13663
 2016-03-04 15:53:25 -05:00
Jacob Schatz ec68d673b2 Merge branch 'ctr-enter-textarea-mac' into 'master' 
ctrl+enter on mac correctly submits forms

Closes #4177

See merge request !3089
 2016-03-04 20:29:04 +00:00
Robert Speicher fcfdb23a23 Don't generate factories automatically 2016-03-04 15:26:51 -05:00
Robert Speicher 6df45eb463 Move all factory definitions to their own file 2016-03-04 15:26:51 -05:00
Robert Speicher 5de46014d7 Bump factory_girl_rails to ~> 4.6.0 2016-03-04 15:26:41 -05:00
Jacob Schatz 9cae8dbbfb Uses the correct variable names for this situation. 2016-03-04 14:40:52 -05:00
Jacob Schatz 9afab2963c Only save right sidebar position cookie if user did the collapsing. 2016-03-04 14:31:33 -05:00
Jacob Schatz 8835514b10 Fixes style consistencies. 2016-03-04 13:24:24 -05:00
Jacob Schatz cb73470b93 Merge branch 'dropdown-design-update' into 'master' 
Updated dropdown CSS

This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field

![Screen_Shot_2016-03-04_at_12.23.49](/uploads/6f2047ec1b72974334fa56e6895a32be/Screen_Shot_2016-03-04_at_12.23.49.png)

See merge request !3092
 2016-03-04 18:05:53 +00:00
Rémy Coutable a697b015f7 Remove "(unreleased)" from 8.5.4 changelog 
[ci skip]
 2016-03-04 16:10:47 +01:00
Jacob Schatz 1400f19793 Merge branch 'dashboard-search-field-tabindex' into 'master' 
Added tabindex to filter field

Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much.

Closes #3706 

See merge request !3093
 2016-03-04 14:54:53 +00:00
Jacob Schatz c060823d02 Fix remaining media queries using correct bs paradigms. 2016-03-04 09:06:57 -05:00
Jacob Schatz d98dc53106 Correct media queries for small devices and tablets. 2016-03-04 09:06:57 -05:00
Jacob Schatz 614cd8d12e Sidebar overflow on xs side. 2016-03-04 09:06:57 -05:00
Jacob Schatz 6e6a25187d Combining recent change to have username in header with my MR. 2016-03-04 09:06:57 -05:00
Jacob Schatz cabd228f70 Fix bugs with open and close buttons 2016-03-04 09:06:57 -05:00
Jacob Schatz 61ce134fa9 Small outside aside shrink sidebar button for mobile only. 2016-03-04 09:06:57 -05:00
Jacob Schatz cabb61719d Open sidebar button on mobile. 2016-03-04 09:06:57 -05:00
Jacob Schatz c3e07b6f9c Move static icon and change appearance. 
MR meta details media queries.
 2016-03-04 09:06:57 -05:00
Jacob Schatz d913febf0f Hide correct author info in header of issuable. 2016-03-04 09:06:57 -05:00
Jacob Schatz 2feb9eb1f0 Change icons for open close on issue/MR 
Button full width on phone on MR/issue.
 2016-03-04 09:06:57 -05:00
Phil Hughes c10bb7b50a Dropdown caret color in variable 2016-03-04 14:00:04 +00:00
Phil Hughes 298971ed58 Updated CSS so .open doesnt have to be on a dropdown element 2016-03-04 13:49:23 +00:00
Dmitriy Zaporozhets 954b98377f Merge remote-tracking branch 'origin/issue_5854' 2016-03-04 14:29:57 +01:00
Dmitriy Zaporozhets d6f26e41db Merge remote-tracking branch 'origin/sort-starred-projects' 2016-03-04 14:24:22 +01:00
Phil Hughes 144f8eff89 Added tabindex to filter field 
Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much
Closes #3706
 2016-03-04 12:39:18 +00:00
Phil Hughes 8c0f551f49 Updated dropdown CSS 
This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field
 2016-03-04 12:20:20 +00:00
Rémy Coutable b763c65eff Merge branch 'fix/invalidate-builds-badge-cache' into 'master' 
Invalidate cache for builds badge

This fixes cache issue with badges (we should not cache badge images).

Closes #13982

See merge request !3086
 2016-03-04 12:18:47 +00:00
Phil Hughes 692773c5a0 ctrl+enter on mac correctly submits forms 
Closes #4177
 2016-03-04 10:11:15 +00:00
Grzegorz Bizon 0196c949f7 Add Changelog entry for badges cache fix 2016-03-04 10:38:15 +01:00
Grzegorz Bizon bf921d084e Invalidate cache for builds badge 
Closes #13982
 2016-03-04 10:34:35 +01:00
Jacob Schatz f8c4dc9723 Merge branch 'issue_13300' into 'master' 
Increase the notes polling timeout over time

Originally by @roperzh at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2821

Fixes #13300 

See merge request !3071
 2016-03-04 02:15:34 +00:00
Rubén Dávila 71a2303567 Upgrade carrierwave to 0.10.0. 2016-03-03 20:32:18 -05:00
Robert Speicher f2a9455c38 Merge branch 'ssh-key-settings' into 'master' 
SSH keys settings

Closes #13860

See merge request !3034
 2016-03-04 01:30:06 +00:00
Robert Speicher 518dd9347b Improve consistency of SSH Keys title in administration area 2016-03-03 16:14:00 -05:00
Robert Speicher 70d2fde492 Restructure SSH key table partial rendering 
Prior, we were double-checking `@keys.any?`, and unnecessarily assigning
`is_admin` in a view where it wasn't needed.
 2016-03-03 16:14:00 -05:00
Robert Speicher 1b10724e08 Don't abuse the flash store for displaying SSH Key form errors 2016-03-03 16:13:59 -05:00
Robert Speicher 01b89ee8f1 Remove Profile::KeysController#new action 2016-03-03 16:13:59 -05:00
Robert Speicher 9db57bc65a Move SSH key JS to Profile CS class 2016-03-03 16:13:56 -05:00