summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0610-44/+42
|\ | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵Rémy Coutable2018-03-061-11/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
| | * Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-061-11/+0
| | |
| * | Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher2018-03-051-0/+26
| |\ \ | | | | | | | | | | | | | | | | Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
| | * | CI/CD-only projects FEEric Eastwood2018-03-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
| * | | Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan2018-03-055-14/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
| | * | | Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-054-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Replace deprecated path_with_namespace with full_pathDmitriy Zaporozhets2018-03-051-7/+7
| | |/ / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'kp-label-select-vue' into 'master'Phil Hughes2018-03-051-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Port Labels Select dropdown to Vue See merge request gitlab-org/gitlab-ce!17411
| | * | | Allow exposing methods to `gon_helper`Kushal Pandya2018-03-051-0/+1
| | |/ /
| * | | Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ↵Rémy Coutable2018-03-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reply-by-email did not pick up /unsubscribe quick action" Closes #43334 See merge request gitlab-org/gitlab-ce!17482
| | * | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-actionSean McGivern2018-03-021-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | There are several quick actions now that don't need this access - /todo and /unsubscribe for instance - but when these were first added, there weren't. Quick actions are now responsible for checking their own permissions.
| * | | removed helper methodsPhil Hughes2018-03-022-18/+0
| |/ /
* | | Address review commentsFelipe Artur2018-03-052-8/+6
| | |
* | | Bring one group board to CEFelipe Artur2018-03-033-9/+25
|/ /
* | Remove u2f webpack bundleMike Greiling2018-03-011-5/+0
| |
* | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan2018-03-013-5/+5
|\ \ | |/ |/| | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
| * Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-283-5/+5
| |
* | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-281-0/+31
| |
* | Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵Grzegorz Bizon2018-02-271-4/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
| * | Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroupsSean McGivern2018-02-271-4/+14
| | | | | | | | | | | | | | | Previously, these wouldn't count issues or MRs in subgroups - meaning that if _this_ group had no issues or MRs, we'd show the empty state, which was wrong.
* | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵Douwe Maan2018-02-262-67/+80
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851
| * | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helperJames Lopez2018-02-231-6/+6
| | |
| * | inline methodsJames Lopez2018-02-231-23/+7
| | |
| * | fix fork button issueJames Lopez2018-02-231-1/+1
| | |
| * | refactor code based on feedbackJames Lopez2018-02-231-25/+26
| | |
| * | refactor code based on feedbackJames Lopez2018-02-231-11/+11
| | |
| * | refactor blob link methodsJames Lopez2018-02-231-10/+11
| | |
| * | fix static analysisJames Lopez2018-02-231-1/+1
| | |
| * | fix specsJames Lopez2018-02-231-3/+7
| | |
| * | fix specsJames Lopez2018-02-231-5/+6
| | |
| * | fix specsJames Lopez2018-02-231-1/+1
| | |
| * | more refactoringJames Lopez2018-02-231-17/+15
| | |
| * | some initial refactoringJames Lopez2018-02-231-9/+17
| | |
| * | refactor modify_file_linkJames Lopez2018-02-231-5/+18
| | |
| * | fix specJames Lopez2018-02-231-3/+3
| | |
| * | fix specsJames Lopez2018-02-231-1/+1
| | |
| * | some more refactoringJames Lopez2018-02-232-6/+10
| | |
| * | fix specsJames Lopez2018-02-231-4/+4
| | |
| * | refactor methods further (in helper)James Lopez2018-02-231-7/+20
| | |
| * | a bit more refactoringJames Lopez2018-02-231-25/+3
| | |
| * | initial refactorJames Lopez2018-02-231-14/+22
| |/
* | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json
* | Add DNS verification to Pages custom domainsNick Thomas2018-02-231-0/+1
|/
* Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-237-21/+113
|\ | | | | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208
| * Port `read_cross_project` ability from EEBob Van Landuyt2018-02-227-21/+113
| |
* | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-231-0/+11
| |
* | Move can_current_user_push_to_branch to PresenterOswaldo Ferreira2018-02-221-1/+3
| |
* | Simplify project check with duck typingOswaldo Ferreira2018-02-221-1/+1
| |
* | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-226-16/+53
|\ \ | |/
View Lorry Controller Status