summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4084-epics-username-autocomplete-ce' into 'master'Douwe Maan2018-05-071-0/+12
|\ | | | | | | | | Backport CE changes from "autocomplete usernames in Epic comments/description" See merge request gitlab-org/gitlab-ce!18605
| * Backport of 4084-epics-username-autocompleteMario de la Ossa2018-05-041-0/+12
| |
* | Allow a user to accept/decline termsBob Van Landuyt2018-05-041-0/+12
| | | | | | | | | | When a user accepts, we store this in the agreements to keep track of which terms they accepted. We also update the flag on the user.
* | Make the user dropdown reusableBob Van Landuyt2018-05-041-0/+25
| | | | | | | | | | | | | | We will reuse the the dropdown, but exclude some menu items based on permissions. So moving the menu to a partial, and adding checks for each menu item here.
* | Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-012-140/+138
|\ \ | | | | | | | | | | | | | | | | | | Fix commit trailer rendering when Gravatar is disabled Closes #45633 See merge request gitlab-org/gitlab-ce!18586
| * | Fix commit trailer rendering when Gravatar is disabledDouwe Maan2018-04-252-140/+138
| | |
* | | Exclude LDAP from OmniauthCallbackController base methodsJames Edwards-Jones2018-04-301-0/+24
| |/ |/|
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-261-3/+3
|\ \
| * \ Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-251-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Legacy disk path refactor Closes gitaly#1111 See merge request gitlab-org/gitlab-ce!18364
| | * | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-251-3/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111
* | | Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-261-0/+25
|\ \ \ | |/ / |/| |
| * | fixed rubocopPhil Hughes2018-04-251-2/+2
| | |
| * | restore original script_name configPhil Hughes2018-04-251-0/+11
| | |
| * | added helper specPhil Hughes2018-04-251-0/+14
| |/
* | [Backport] Burndown chart for group milestoneOswaldo Ferreira2018-04-231-0/+15
|/
* Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-192-56/+6
|
* Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon2018-04-162-0/+40
|\ | | | | | | | | | | | | Embedded Snippets Support Closes #8088 See merge request gitlab-org/gitlab-ce!15695
| * fix failing spechaseeb2018-03-071-4/+4
| |
| * fixed failing testhaseeb2018-03-031-1/+1
| |
| * embedded snippets supporthaseeb2018-02-282-0/+40
| |
* | Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-121-2/+43
|\ \ | | | | | | | | | | | | | | | | | | Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
| * | Show `New Issue` link for projectsBob Van Landuyt2018-04-111-0/+22
| | | | | | | | | | | | | | | | | | | | | When a user is not logged in, we want to show the `New Issue` link so he gets directed to the login flow first. When a project is archived, we never want to show the link.
| * | Prevent awarding emoji when a project is archivedBob Van Landuyt2018-04-111-2/+21
| | | | | | | | | | | | This prevents performing the requests, and disables all emoji reaction buttons
* | | Resolve "Clean up old project permissions frontend code"Mike Greiling2018-04-121-68/+0
|/ /
* | Merge branch '43246-checkfilter' into 'master'Sean McGivern2018-04-061-25/+4
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Show a message when loading the issues / merge requests dashboard without filters" Closes #43246 See merge request gitlab-org/gitlab-ce!17961
| * | Fixed dashboard filtering testsJan Provaznik2018-04-031-25/+4
| | |
* | | Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-051-2/+28
| | | | | | | | | | | | | | | Port of "Fix XSS on commit diff view" for 10-6 See merge request gitlab/gitlabhq!2364
* | | Fix links to subdirectories of a directory with a plus character in its pathdm-flatten-tree-plus-charsDouwe Maan2018-04-041-0/+10
|/ /
* | Merge branch 'add-canary-favicon' into 'master'Sean McGivern2018-03-291-0/+5
|\ \ | | | | | | | | | | | | Add canary favicon See merge request gitlab-org/gitlab-ce!12477
| * | Update styling and use Gitlab::Utils.to_booleanEric Eastwood2018-03-271-0/+5
| | |
* | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-271-1/+3
|/ /
* | Fix import helper spec when a previous spec stubs settingsSean McGivern2018-03-151-4/+2
| | | | | | | | This should use stub_omniauth_setting, not do it manually.
* | Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵Douwe Maan2018-03-121-5/+28
|\ \ | | | | | | | | | | | | | | | | | | 'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
| * | Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importingRubén Dávila2018-03-121-5/+28
| | | | | | | | | | | | Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
* | | Add helpers for labels dropdownKushal Pandya2018-03-121-0/+72
|/ /
* | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-0/+9
| |
* | Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-062-7/+7
|\ \ | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * | Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-052-7/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Bring one group board to CEFelipe Artur2018-03-031-0/+28
|/ /
* | Remove u2f webpack bundleMike Greiling2018-03-011-49/+0
|/
* Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵Douwe Maan2018-02-261-4/+4
|\ | | | | | | | | | | | | | | | | '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-1/+1
| |
| * refactor code based on feedbackJames Lopez2018-02-231-4/+4
| |
| * some initial refactoringJames Lopez2018-02-231-5/+5
| |
* | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-261-16/+16
|/ | | | | | | | | | 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
* Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-237-15/+153
|\ | | | | | | | | 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-15/+153
| |
* | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-231-0/+16
| |
* | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-224-14/+54
|\ \ | |/
| * Escape HTML entities in commit messagesDouwe Maan2018-02-151-0/+4
| |
View Lorry Controller Status