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
81,341 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

3189 Commits

Author SHA1 Message Date
Phil Hughes 3172de0df3 Merge branch 'refactor-main-js' into 'master' 
Refactor main.js content

See merge request gitlab-org/gitlab-ce!19783
 2018-09-19 11:57:51 +00:00
Dmitriy Zaporozhets 7f8a520f8a Unite green buttons under one css class 
Rename btn-new, btn-create and btn-save to btn-success

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-09-19 13:55:48 +03:00
Mike Greiling 196dfd2627
Move shortcuts classes into behaviors/shortcuts 2018-09-18 17:26:15 -05:00
Mike Greiling 08c3920ce1
Move findAndFollowLink to lib/utils 2018-09-18 14:43:46 -05:00
Filipa Lacerda 07c6c9db57 Merge branch 'decouple-file-row-from-ide' into 'master' 
Decouple file row from IDE

See merge request gitlab-org/gitlab-ce!21742
 2018-09-17 16:19:27 +00:00
Phil Hughes 163ec966c1
Decouple file row from IDE 
This makes the file row component re-usable ouside of the Web IDE

Pre-request for https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
 2018-09-17 12:17:00 +01:00
Marcel Amirault 6876c7afa8 Fix grammar (setup to set-up) in code comments, spec, views, etc. 2018-09-17 09:17:33 +00:00
Filipa Lacerda ba40c7f1c3 Merge branch 'mr-widget-discussion-state-fix' into 'master' 
Fixed MR widget unresolved discussions state

See merge request gitlab-org/gitlab-ce!21705
 2018-09-17 08:20:19 +00:00
Lukas Eipert 835733a070
Fix karma junit reports on CI 2018-09-14 15:52:38 +02:00
Grzegorz Bizon 55c23a0935 Merge branch 'feature/runner-state-filter-for-admin-view' into 'master' 
Feature: State filter for admin runners view

See merge request gitlab-org/gitlab-ce!19625
 2018-09-14 09:03:44 +00:00
Paul Slaughter ae5600b868 Create specs for diffs/components/app and update modules to export factory functions 2018-09-14 08:25:13 +00:00
Mike Greiling 05f403cf04
Move search autocomplete from dispatcher to main.js 2018-09-14 01:22:53 -05:00
Mike Greiling 5bdaf5167c Merge branch 'mr-fixed-expanded-state-not-working' into 'master' 
Fixed resolved discussions not toggling expanded on changes tab

Closes #51370

See merge request gitlab-org/gitlab-ce!21676
 2018-09-13 17:45:07 +00:00
Phil Hughes a77a26eade
Use MR widget event_hub to dispatch update event 
Instead of relying on a global method, we now emit an event on the MR
widget that tells it to check the status
 2018-09-13 12:52:24 +01:00
André Luís 06025e4a26 Display click to expand on collapsed diffs 2018-09-13 12:34:18 +01:00
Phil Hughes e12c2c77ce
Fixed resolved discussions not toggling expanded 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370
 2018-09-13 10:22:35 +01:00
Phil Hughes 8287f3477f
Fixed MR widget unresolved discussions state 
After resolving a discussion on a merge request page the merge request
widget state would not get updated meaning users would need to refresh
the page to merge (if that option is enabled in the projects settings)

https://gitlab.com/gitlab-org/gitlab-ce/issues/42882
 2018-09-12 16:46:09 +01:00
Adriel Santiago 106640e031
Use GitLab ui pagination component for groups 2018-09-11 21:16:43 -04:00
Clement Ho f815b48f39 Use gitlab-ui loading icon 2018-09-11 22:19:21 +00:00
Winnie Hellmann 01b669640a Generate JUnit report for Karma tests 2018-09-11 21:03:05 +00:00
Tim Zallmann 12b48e61af Resolve "On master, inline diff view contains extra `+` and `-` signs" 2018-09-10 08:50:41 +00:00
André Luís 04c0d12d1a Resolve "Merge requests show outdated discussions on changes tab" 2018-09-08 06:37:41 +00:00
Martin Wortschack 03ab130e4b Resolve "Create new project: Re-add project name field" 2018-09-08 06:03:00 +00:00
Mike Greiling 6d1b585034 Merge branch 'tz-mr-new-datastructure' into 'master' 
Vue MR Page - Data structure update

See merge request gitlab-org/gitlab-ce!21062
 2018-09-07 23:27:24 +00:00
Mike Greiling d66d548ce2 Merge branch '50527-forward-to-chrome-69' into 'master' 
Forward build image to use Chrome 69

Closes #50527

See merge request gitlab-org/gitlab-ce!21586
 2018-09-07 20:38:52 +00:00
Tim Zallmann d2cbe07398 Adapted so utils + actions don't include any mutations and mutations are always against state 2018-09-07 17:13:11 +02:00
Tim Zallmann d4d5ed59f9 Fixes based on MR discussion around naming, mutations, handling of state 2018-09-07 16:20:57 +02:00
Jan Provaznik d95c1f0335 Use ResourceLabelEvent for tracking label changes 2018-09-07 13:39:20 +00:00
Phil Hughes feae897552
karma fixes 2018-09-07 11:28:03 +01:00
Phil Hughes 9badf9e723
fixed `list_item_spec.js` 2018-09-07 11:28:03 +01:00
Phil Hughes 93e84c8f28
fixed tests 2018-09-07 11:28:02 +01:00
Phil Hughes 1f808ffe9e
update components to match designs in commit section 2018-09-07 11:28:01 +01:00
Tim Zallmann 982da16bf2 Made the discussion tests artificial to have them stable, mocked RAF + RIC 2018-09-07 12:25:50 +02:00
Tim Zallmann b8ecb2c7eb Added new tests for newly added mutations, actions, utils 2018-09-07 12:25:50 +02:00
Tim Zallmann a0dc392362 Fix Linting Error 2018-09-07 12:25:50 +02:00
Tim Zallmann d3cf0c247b Fix for Karma, Static Analysis and RSPec for MR Page 2018-09-07 12:25:50 +02:00
Tim Zallmann 958cf02e91 Fixes for Karma tests 2018-09-07 12:25:50 +02:00
Tim Zallmann 8563499b0f Fix for Getter + Linting 2018-09-07 12:25:50 +02:00
Tim Zallmann a424e8141b Fixes for Karma Tests 2018-09-07 12:25:50 +02:00
Tim Zallmann b8b2cb3675 Fixed Problems with Inline View + Specs 2018-09-07 12:25:50 +02:00
Tim Zallmann 44cb8a7407 Merge branch 'boards-querystring-backport' into 'master' 
don't add trailing = when in urlParamsToArray function

See merge request gitlab-org/gitlab-ce!21179
 2018-09-07 10:20:27 +00:00
Lukas Eipert b743c35df9
adjust test fixture for favicon with overlay 
It seems like Chrome > 67 has changed the way how canvas works
and therefore the resulting data URL from combining two images
changed subtly, even thpugh the visuals are almost the same.
 2018-09-07 10:55:10 +02:00
Phil Hughes 21ed2da067
fixed double scroll 
improved variable & prop names
 2018-09-07 08:24:42 +01:00
Phil Hughes 3f6500383f
fixed some bugs around with the template dropdowns 2018-09-07 08:24:42 +01:00
Phil Hughes 5b84c2fbc2
added component specs 2018-09-07 08:24:01 +01:00
Phil Hughes c883b52686
renames file when template type is changed 2018-09-07 08:24:00 +01:00
Dennis Tang 5b74a1aebc Resolve "Improve handling of projects shared with a group" 2018-09-07 06:09:13 +00:00
Simon Knox 4d2e9a1f32 multiseries 2018-09-07 06:05:10 +00:00
Mike Greiling d96d0ec17d Merge branch '33475-files-inside-wiki-repo-fe' into 'master' 
FE for "Uploads to a wiki should be stored inside the wiki git repository"

See merge request gitlab-org/gitlab-ce!21466
 2018-09-06 22:56:10 +00:00
Paul Slaughter 254cfcb7f4 Updapte eslintrc no-param-reassign with 'ignorePropertyModificationsFor' 2018-09-06 14:42:25 -05:00