summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-139-15/+32
| | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* Merge branch 'mk-fix-leaky-spec' into 'master'Stan Hu2017-12-121-4/+13
|\ | | | | | | | | CE Backport - Fix order-dependent spec failure by avoiding monkeypatching See merge request gitlab-org/gitlab-ce!15893
| * Fix spec by avoiding monkeypatchingMichael Kozono2017-12-121-4/+13
| |
* | Merge branch 'remove-tabindexes-from-tag-form' into 'master'Annabel Dunstone Gray2017-12-122-3/+8
|\ \ | | | | | | | | | | | | removed tab indexes from tag form See merge request gitlab-org/gitlab-ce!15886
| * | removed tab indexes from tag formMarcus Amargi2017-12-122-3/+8
| | |
* | | Merge branch 'noteable-touch-return-object' into 'master'Stan Hu2017-12-121-0/+3
|\ \ \ | |_|/ |/| | | | | | | | Return the noteable in Note#touch_noteable See merge request gitlab-org/gitlab-ce!15891
| * | Return the noteable in Note#touch_noteablenoteable-touch-return-objectYorick Peterse2017-12-121-0/+3
| | | | | | | | | | | | | | | This allows EE to re-use the object, making it easier to trigger indexing of the noteable.
* | | Merge branch ↵Robert Speicher2017-12-1223-53/+456
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
| * | | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-1215-42/+95
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Refactor member view by using presenterTM Lee2017-12-1112-25/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'tm/docs/docker-extended-entrypoint-fix' into 'master'Achilleas Pipinellis2017-12-121-22/+39
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix entrypoint overriding documentation See merge request gitlab-org/gitlab-ce!15884
| * | | Refactor entrypoint override docstm/docs/docker-extended-entrypoint-fixAchilleas Pipinellis2017-12-121-61/+36
| | | |
| * | | Fix entrypoint overriding documentationTomasz Maczukin2017-12-121-3/+45
| | |/ | |/|
* | | Merge branch 'qa/gb/selenium-handle-domain-sessions' into 'master'Grzegorz Bizon2017-12-1216-119/+154
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Handle domain sessions better in QA scenarios Closes gitlab-qa#102 See merge request gitlab-org/gitlab-ce!15452
| * | | Remove noisy notification from QA base pageqa/gb/selenium-handle-domain-sessionsGrzegorz Bizon2017-12-121-2/+0
| | | |
| * | | Remove unused page from hashed storage QA scenarioGrzegorz Bizon2017-12-121-1/+0
| | | |
| * | | Update browser.rbGrzegorz Bizon2017-12-111-2/+2
| | | |
| * | | Update browser.rbGrzegorz Bizon2017-12-111-1/+1
| | | |
| * | | Merge branch 'master' into qa/gb/selenium-handle-domain-sessionsGrzegorz Bizon2017-12-11326-2478/+5265
| |\ \ \ | | | | | | | | | | | | | | | * master: (93 commits)
| * | | | Fix minor Rubocop offenses in QA browser runtimeGrzegorz Bizon2017-12-112-2/+4
| | | | |
| * | | | Decouple subject's address from page objects in QAGrzegorz Bizon2017-12-0710-33/+40
| | | | |
| * | | | Fix QA group creation by filling required filedsGrzegorz Bizon2017-12-071-0/+1
| | | | |
| * | | | Fix runtime QA browser and capturing screenshotsGrzegorz Bizon2017-12-071-2/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'master' into qa/gb/selenium-handle-domain-sessionsGrzegorz Bizon2017-12-071565-11449/+29480
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (694 commits) Conflicts: qa/qa/page/base.rb qa/qa/page/main/entry.rb
| * | | | | Make QA runtime browser an actable objectGrzegorz Bizon2017-11-195-60/+56
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Remove GitLab entry page class in QAGrzegorz Bizon2017-11-172-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Use QA browser to navigate to pages and handle sessionsGrzegorz Bizon2017-11-1711-18/+49
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | WIP Handle domain sessions better in QA test scenarioGrzegorz Bizon2017-11-178-48/+61
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'winh-cleanup-dropdowns' into 'master'Annabel Dunstone Gray2017-12-1232-361/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up new dropdown styles Closes #39142 and #39446 See merge request gitlab-org/gitlab-ce!13676
| * | | | | | Make label delete option redwinh-cleanup-dropdownsWinnie Hellmann2017-12-083-12/+9
| | | | | | |
| * | | | | | Fix hover style for dropdowns on new branches/tags pageWinnie Hellmann2017-12-082-2/+2
| | | | | | |
| * | | | | | Fix top margin for right aligned dropdownsWinnie Hellmann2017-12-081-1/+0
| | | | | | |
| * | | | | | Remove border radius from pipelines dropdownsWinnie Hellmann2017-12-081-1/+0
| | | | | | |
| * | | | | | Remove btn class from template selectorsWinnie Hellmann2017-12-081-5/+5
| | | | | | |
| * | | | | | Fix dropdown top marginWinnie Hellmann2017-12-081-1/+1
| | | | | | |
| * | | | | | Fix padding for search dropdownWinnie Hellmann2017-12-081-5/+0
| | | | | | |
| * | | | | | Remove new-style-dropdown mixinWinnie Hellmann2017-12-0826-85/+0
| | | | | | |
| * | | | | | Use global styles for filter dropdownsWinnie Hellmann2017-12-082-54/+10
| | | | | | |
| * | | | | | Make new .dropdown-menu-align-right style globalWinnie Hellmann2017-12-081-4/+2
| | | | | | |
| * | | | | | Make new .dropdown-menu style globalWinnie Hellmann2017-12-081-15/+1
| | | | | | |
| * | | | | | Make new .dropdown-menu-selectable style globalWinnie Hellmann2017-12-081-39/+28
| | | | | | |
| * | | | | | Make new dropdown <li> style globalWinnie Hellmann2017-12-081-17/+2
| | | | | | |
| * | | | | | Make new dropdown-link style globalWinnie Hellmann2017-12-081-21/+10
| | | | | | |
| * | | | | | Make new .dropdown-menu-user-link style globalWinnie Hellmann2017-12-081-13/+7
| | | | | | |
| * | | | | | Make new dropdown-item-hover style globalWinnie Hellmann2017-12-081-39/+23
| | | | | | |
| * | | | | | Make new .text-danger style globalWinnie Hellmann2017-12-081-10/+5
| | | | | | |
| * | | | | | Make new .is-active style globalWinnie Hellmann2017-12-081-18/+7
| | | | | | |
| * | | | | | Make new .dropdown-header style globalWinnie Hellmann2017-12-081-6/+2
| | | | | | |
| * | | | | | Make new style .divider globalWinnie Hellmann2017-12-081-15/+5
| | | | | | |
| * | | | | | Make new .dropdown-open-top style globalWinnie Hellmann2017-12-081-4/+4
| | | | | | |
View Lorry Controller Status