summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'not_ignore_parameter_of_mr_change_branches_path' into 'master'Rémy Coutable2017-02-151-4/+4
|\ | | | | | | | | Don't ignore the parameter of MergeRequestsHelper#mr_change_branches_path See merge request !9223
| * Don't ignore the parameter of MergeRequestsHelper#mr_change_branches_pathDongqing Hu2017-02-141-4/+4
| |
* | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-142-2/+2
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-rubocop-rspec' into 'master' Rémy Coutable2017-02-131-1/+1
|\ | | | | | | | | Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops See merge request !9151
| * Enable `Style/RedundantException` cop and correct offenseRobert Speicher2017-02-101-1/+1
| |
* | Merge branch '27939-fix-current-build-arrow' into 'master' Filipa Lacerda2017-02-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix current build arrow Closes #27939 See merge request !9154
| * | Fix current build arrow27939-fix-current-build-arrowEric Eastwood2017-02-131-1/+1
| |/ | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27939
* | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-131-0/+13
|\ \ | | | | | | | | | | | | | | | | | | Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133
| * | Add WikiPage.unhyphenizeAlex Braha Stoll2017-01-301-1/+1
| | |
| * | Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-2914-42/+93
| |\ \
| * | | Add a breadcrumb at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-311-0/+13
| | | |
* | | | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-081-1/+3
| |_|/ |/| |
* | | Merge branch '26705-filter-todos-by-manual-add' into 'master'Sean McGivern2017-02-081-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Filter todos by manual add Closes #26705 See merge request !8861
| * | | Filter todos by manual addJacopo2017-01-281-1/+3
| | |/ | |/| | | | | | | Added the option to filter todo by Added and Pipelines
* | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-081-2/+2
|\ \ \ | | | | | | | | | | | | | | | | pass in current_user in MergeRequest and MergeRequestsHelper See merge request !8624
| * | | should pass in current_user from MergeRequestsHelperDongqing Hu2017-01-191-2/+2
| | | |
* | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-071-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * | | | Address feedbackDouwe Maan2017-02-061-2/+2
| | | | |
| * | | | Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-0/+11
| | | | |
* | | | | Merge branch '27632_fix_mr_widget_url' into 'master'Sean McGivern2017-02-071-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR widget url Closes #27632 See merge request !8989
| * | | | | Fix MR widget urlJarka Kadlecova2017-02-071-2/+2
| |/ / / /
* | | | | Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-061-0/+4
| | | | |
* | | | | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-061-1/+1
|/ / / / | | | | | | | | | | | | Added tests to verify the access policy to the new controller
* | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed eslint test failure Fixed redirection from http://someproject.git to http://someproject Add traits for the different Event types to the Event factory prevent nonewline type diff lines from containing unfolding link ensure linenumber data attribute is correct for the last line in a diff chunk ensure last line in diff block is contained within a table row element ensure click event is bound only once
| * \ \ \ Merge branch 'docs/integrations' into 'master' Achilleas Pipinellis2017-02-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor integrations page documentation See merge request !8966
| | * | | | Move webhooks to new a location under IntegrationsAchilleas Pipinellis2017-02-031-1/+1
| | | | | |
* | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-034-4/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ...
| * | | | | Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Turbolinks Closes #25624 See merge request !8570
| | * | | | | Remove turbolinks.Bryce Johnson2017-02-021-1/+1
| | | | | | |
| * | | | | | Removes labels instead of closing issue when clicking remove buttonPhil Hughes2017-02-031-0/+1
| | | | | | |
| * | | | | | Fixed bug with empty state showing after searchPhil Hughes2017-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed users href path being incorrect
| * | | | | | Merge branch 'squash' into 'master' Sean McGivern2017-02-031-0/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Backport changes from EE squash See merge request !8912
| | * | | | | Backport changes from EE squashSean McGivern2017-02-031-0/+12
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
| * | | | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-031-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | replace `find_with_namespace` with `find_by_full_path` See merge request !8949
| | * | | | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-031-1/+1
| | | |/ / | | |/| | | | | | | | | | | | add complete changelog for !8949
* | | | | Merge branch 'master' into webpackMike Greiling2017-02-023-7/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (63 commits) Use `add_$role` helper in snippets specs removes old css class from everywhere Fixes broken build: Use jquery to get the element position in the page Check public snippets for spam Keep snippet visibility on error Update pipeline and commit URL and text on CI status change Support non-ASCII characters in GFM autocomplete Active tense test coverage Fix filtered search manager spec teaspoon error Reduce the number of loops that Cycle Analytics specs use Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Improve styling of the new issue message Don't capitalize environment name in show page ...
| * | | | Merge branch '27291-unify-mr-diff-file-buttons' into 'master' Annabel Dunstone Gray2017-02-022-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unifies mr diff file button style Closes #27291 See merge request !8874
| | * | | | removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-021-2/+2
| | | | | |
| | * | | | unifies mr diff file button styleNur Rony2017-01-301-1/+1
| | |/ / /
| * | | | Keep snippet visibility on errorSean McGivern2017-02-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a snippet is submitted, but there's an error, we didn't keep the visibility level. As the default is private, this means that submitting a public snippet that failed would then fall back to being a private snippet.
* | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-312-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (83 commits) Fix small typo on new branch button spec Abillity to promote project labels to group labels Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. cop for gem fetched from a git source Add CHANGELOG entry Remove new branch button for confidential issues Remove flash warning from login page add complete changelog Add project ID index to `project_authorizations` table to optimize queries Fix disable storing of sensitive information when importing a new repo Fix notification when global=disabled, group=watch Ensure rake is called within the correct bundle context Fix 8.16.0 release date. Improve search within group logic Add changelog item about new attributes in group api Update group api doc with full_name and full_path attributes Add tests for nested groups in search service and search helper ...
| * | | | Use full group name/path in UI dropdownsDmitriy Zaporozhets2017-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move issuable reference display to a helper methodOswaldo Ferreira2017-01-271-0/+4
| |/ / /
* | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-277-13/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (389 commits) Document "No gems fetched from git repositories" policy [ci skip] Typos Small gramatical tweaks Typos Added PHP & NPM doc Use `:empty_project` where possible in request specs Add caching of droplab ajax requests Use `:empty_project` where possible in model specs Revert 3f17f29a Remove unused js response from refs controller Add MR id to changelog entry fixed small mini pipeline graph line glitch Prevent form to be submitted twice Fix Error 500 when repositories contain annotated tags pointing to blobs Fix /explore sorting (trending) Simplify wording in "adding an image" docs Remove "official merge window" from CONTRIBUTING.md [ci skip] Update repository check documentation Fixed flexbox and wrap issues Update two_factor_authentication.md ...
| * | | Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Nested groups feature improvemetns See merge request !8448
| | * | | Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' Sean McGivern2017-01-251-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only show Merge Request button when user can create a MR See merge request !8639
| | * | | | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowedToon Claes2017-01-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `can?` already includes the `feature_available?` check, so no need to check this again.
| | * | | | Only show Merge Request button when user can create a MRToon Claes2017-01-201-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | The Create Merge Request button only should be shown when the user is allowed to create a Merge request.
| * | | | hide the version check image if internet connection is brokenKen Ding2017-01-251-1/+2
| | | | |
View Lorry Controller Status