root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
54,130 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1150 Commits

Author SHA1 Message Date
Phil Hughes a90b18b97f Merge branch '33642-timeago-update' into 'master' 
Remove js classes from vue component that are not needed in vue component

Closes #33642

See merge request !12133
 2017-06-13 16:47:50 +00:00
Mike Greiling a526e619d9 Revert "Merge branch 'karma-headless-chrome' into 'master'" 
This reverts merge request !12036
 2017-06-13 15:20:26 +00:00
Filipa Lacerda aeabd307ba Remove js classes from vue component that are not needed in vue component 2017-06-13 15:33:57 +01:00
Mike Greiling 037b070653 remove phantomjs-specific test hacks 2017-06-13 00:23:39 -05:00
Mike Greiling 0ff932cdce fix incorrect equals assertion 2017-06-13 00:23:39 -05:00
Filipa Lacerda 452202e36d Improve Job detail view to make it refreshed in real-time instead of reloading 2017-06-12 09:20:19 +00:00
Filipa Lacerda 5279a39e97 Use vue files for navigation tabs and buttons 2017-06-12 07:48:54 +00:00
Douwe Maan b38c74d696 Revert 'New file from interface on existing branch' 2017-06-09 10:10:47 -05:00
Filipa Lacerda 288e8c7c42 Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master' 
Fixed dropdown filter input not focusing after transition

Closes #33216

See merge request !12020
 2017-06-09 08:36:56 +00:00
Regis Boudinot b1bf6d88fc Merge branch 'master-security-update' into 'master' 
Master security update

See merge request !12025
 2017-06-08 20:06:09 +00:00
Phil Hughes dfa4a440f0 Fixed dropdown filter input not focusing after transition 
Closes #33216
 2017-06-08 18:06:47 +01:00
Alfredo Sumaran b55bd9ef95 Merge branch 'master' into 25426-group-dashboard-ui 2017-06-08 10:15:27 -05:00
Alfredo Sumaran c24b706824 Add tests when user has no direct acces to a group 2017-06-08 03:45:18 -05:00
DJ Mountney 1d1363e2bb Bring in security changes from the 9.2.5 release 
Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
 2017-06-07 21:16:20 -07:00
Alfredo Sumaran 7ff17980ce Display user access type for each group 
Also adds unit tests for this
 2017-06-07 23:00:03 -05:00
Bob Van Landuyt bdebe849b8 Translate project & repository pages 2017-06-07 20:13:44 +00:00
Alfredo Sumaran 3ec37e2622 Merge branch 'master' into 25426-group-dashboard-ui 2017-06-07 14:45:57 -05:00
Phil Hughes 986eff1cf2 Merge branch 'auto-search-when-state-changed' into 'master' 
Perform filtered search when state tab is changed

Closes #27261

See merge request !11917
 2017-06-07 17:14:34 +00:00
Clement Ho 60d2a7c355 Use data attributes instead of class 2017-06-07 10:54:54 -05:00
Filipa Lacerda 0601ac5d0b Merge branch '32587-fix-horse-racing-emoji-codepointat-npe' into 'master' 
Fix NPE with horse racing emoji check

Closes #32587

See merge request !11872
 2017-06-07 15:12:04 +00:00
Douwe Maan 0bcb1d35ec Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master' 
Expand/collapse close & backlog lists in issue boards

Closes #23917

See merge request !11820
 2017-06-07 15:05:37 +00:00
Alfredo Sumaran a65f07a256 Address feedback 2017-06-07 10:05:17 -05:00
Rémy Coutable ee0e3ffc05 Merge branch '3191-deploy-keys-update' into 'master' 
Implement ability to update deploy keys

Closes #3191

See merge request !10383
 2017-06-07 14:37:50 +00:00
Alfredo Sumaran f5dfd98856 Address feedback 2017-06-07 04:27:53 -05:00
Phil Hughes 9c2f82842b Merge branch '31633-animate-issue' into 'master' 
animate adding issue to boards

Closes #31633

See merge request !11785
 2017-06-07 07:41:24 +00:00
Clement Ho d565b30ce6 Add jasmine spec for searchState 2017-06-06 18:18:31 -05:00
Filipa Lacerda d1c2d36f03 Merge branch 'fix_commits_page' into 'master' 
Fix duplication of commits header on commits page

Closes #13879

See merge request !11006
 2017-06-06 19:57:07 +00:00
Clement Ho 196a3c546c Change from double click to single click to open dropdown 2017-06-06 10:52:50 -05:00
Alfredo Sumaran bd95138414 Remove non existent bundle 2017-06-06 09:02:29 -05:00
Alfredo Sumaran d8403ec18f Minor visual adjustments 2017-06-06 09:01:42 -05:00
Bryce Johnson c9a67266d2 Move issuable bulk edit form into a new sidebar. 2017-06-06 09:16:27 -04:00
Annabel Dunstone Gray 7a9c9a259e Responsive environment tables 2017-06-06 12:58:29 +00:00
Clement Ho 67d3d0a488 Fix header component spec 2017-06-05 16:25:59 -05:00
Phil Hughes c34107608e Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master' 
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

See merge request !11478
 2017-06-05 10:42:33 +00:00
Kushal Pandya 7abe27b425 Improve user experience around slash commands in instant comments 2017-06-05 09:12:15 +00:00
blackst0ne 78f131c051 Fix duplication of commits header on commits page 2017-06-03 12:40:20 +11:00
Eric Eastwood c88d9cf34c Fix NPE with horse racing emoji check 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32587
 2017-06-02 15:44:14 -05:00
tauriedavis a9e0218cc5 32118 Make New environment empty state btn lowercase 2017-06-02 13:00:21 -07:00
Alexander Randa 3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Tim Zallmann 51c196160a Merge branch 'winh-styled-people-search-bar' into 'master' 
Style people in issuable search bar

Closes #30468

See merge request !11402
 2017-06-02 16:40:57 +00:00
Phil Hughes a980a4f638 added tests for collapsing 2017-06-02 17:25:18 +01:00
Luke "Jared" Bennett 5a4a082490
Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3 2017-06-02 17:17:54 +01:00
winh 0583916d2d Style people in issuable search bar (!11402) 2017-06-02 16:30:37 +02:00
Sean McGivern dab2662194 Merge branch '31511-jira-settings' into 'master' 
Simplify test&save actions when setting a service integration

Closes #31511

See merge request !11599
 2017-06-02 14:03:15 +00:00
Filipa Lacerda 228b73d5e9 Pipeline show view real time header section 2017-06-02 13:24:42 +00:00
winh b22970648e Add frontend fixture for issue list 2017-06-02 14:42:03 +02:00
winh 67e5235e79 Simplify filtered_search_visual_tokens_spec.js 2017-06-02 14:42:03 +02:00
Dmitriy Zaporozhets ea531e1eff
Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2017-06-02 11:05:38 +03:00
Winnie Hellmann f2b34fb208 Show current user immediately in issuable filters 2017-06-02 07:42:18 +00:00
Kamil Trzciński 8d131eb85d Merge branch 'zj-realtime-env-list' into 'master' 
Realtime env list

Closes #31701

See merge request !11333
 2017-06-01 20:38:46 +00:00