summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Limit level of nesting for groupsdz-limit-nested-groupsDmitriy Zaporozhets2017-02-081-1/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix/import-group-members' into 'master' Rémy Coutable2017-02-071-1/+1
|\ | | | | | | | | | | | | Fix missing group members from Import/Export Closes #25124 See merge request !8923
| * Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-071-1/+1
| |
* | Merge branch 'issue_19262' into 'master' Sean McGivern2017-02-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Disallow system notes for closed issuables Closes #19262 See merge request !8848
| * | Disallow system notes for closed issuablesissue_19262Felipe Artur2017-02-061-0/+1
| | |
* | | Merge branch '26920-hover-cursor-on-pagination-element' into 'master' Filipa Lacerda2017-02-071-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Mouse text cursor above pagination elements" Closes #26920 See merge request !9003
| * | | fixes cursor issue on pipeline paginationNur Rony2017-02-071-0/+14
| | | |
* | | | Merge branch ↵Kamil Trzciński2017-02-0715-61/+85
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master' Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines" Closes #26165 See merge request !8430
| * | | Updated the #create action to render the show view in case of a form errorJose Ivan Vargas2017-02-061-2/+2
| | | |
| * | | Improved code styling on the variables_controller_specJose Ivan Vargas2017-02-062-5/+4
| | | | | | | | | | | | | | | | | | | | Also updated the #update action inside the variables controller as to render the show and not redirect back to the settings route
| * | | Added tests for the variables controller #update actionJose Ivan Vargas2017-02-061-2/+3
| | | |
| * | | Modified redirection logic in the variables cont.Jose Ivan Vargas2017-02-061-2/+3
| | | | | | | | | | | | | | | | Redirections now show a flash message wether the variable was created correctly or not using a flash message
| * | | Added redirections to the index actions for the variables and triggers ↵Jose Ivan Vargas2017-02-062-0/+8
| | | | | | | | | | | | | | | | controllers
| * | | Added a flash message to the creation of triggersJose Ivan Vargas2017-02-061-2/+3
| | | |
| * | | Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-064-3/+11
| | | |
| * | | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-068-26/+17
| | | | | | | | | | | | | | | | Added tests to verify the access policy to the new controller
| * | | Added private methods to initialize variables in the ci_cd_pipelines_controllerJose Ivan Vargas2017-02-061-5/+16
| | | |
| * | | Corrected titles on the triggers and pipelines sectionsJose Ivan Vargas2017-02-063-3/+3
| | | |
| * | | Corrected tests and changed trigger controller redirects to the ↵Jose Ivan Vargas2017-02-061-3/+3
| | | | | | | | | | | | | | | | ci_cd_pipelines_settings controller
| * | | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-061-14/+2
| | | | | | | | | | | | | | | | Added test for the CiCdPipelinesController
| * | | Fixed badges testJose Ivan Vargas2017-02-061-1/+1
| | | |
| * | | changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-067-12/+12
| | | |
| * | | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-0611-41/+57
| | | |
* | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-078-45/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
| * | | | List all groups/projects for admins on explore pagesDouwe Maan2017-02-061-1/+1
| | | | |
| * | | | Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| | | | |
| * | | | More backportDouwe Maan2017-02-061-4/+13
| | | | |
| * | | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-063-7/+28
| | | | |
| * | | | Backport UI changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-062-22/+23
| | | | |
| * | | | Backport changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-063-21/+30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Some changes in EE for the auditor user feature need to be backported to CE to avoid merge conflicts. This commit encapsulates all these backports.
* | | | Merge branch '27343-autocomplete-post-to-wrong-url-when-not-hosting-in-root' ↵Filipa Lacerda2017-02-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Closes #27343 See merge request !8891
| * | | | Fix filtered search user autocomplete for gitlab instances that are hosted ↵27343-autocomplete-post-to-wrong-url-when-not-hosting-in-rootClement Ho2017-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | on a subdirectory
* | | | | Merge branch 'commit-description-border' into 'master' Alfredo Sumaran2017-02-061-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove lighter colored commit description border See merge request !9005
| * | | | | Remove lighter colored commit description bordercommit-description-borderAnnabel Dunstone Gray2017-02-061-1/+0
| |/ / / /
* | | | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-0632-256/+672
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Use vue.js Pipelines table in commit and merge request view Closes #27141 See merge request !8844
| * | | | Use webpack to require filesFilipa Lacerda2017-02-0511-44/+42
| | | | | | | | | | | | | | | | | | | | Changes after review
| * | | | Use webpack to require filesFilipa Lacerda2017-02-055-15/+15
| | | | |
| * | | | Move interceptor to common interceptors filesFilipa Lacerda2017-02-051-0/+8
| | | | |
| * | | | Use webpackFilipa Lacerda2017-02-054-74/+55
| | | | |
| * | | | Move repeated function to utilitiesFilipa Lacerda2017-02-051-0/+8
| | | | |
| * | | | Fix broken path to fileFilipa Lacerda2017-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Fix broken path to file
| * | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-04108-302/+303
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) fix failing test fix Vue warnings for missing element [ci skip] UX Guide: Button placement in groups 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 redirection from http://someproject.git to http://someproject consistently use single quotes allow application.js to require other scripts which start with application* DRY with Gitlab.config.webpack.dev_server references disable webpack proxy in rspec environment due to conflicts with webmock gem remove changes to Procfile configure webpack dev server port via environment variable add rack middleware to proxy webpack dev server remove dev-server config from development environment Document that the retro and kickoff notes are public add CHAGELOG.md entry for webpack branch fix failing rspec build fix test failure for merge request widget ...
| * | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0380-176/+1231
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Fixed eslint test failure 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 ...
| * | | | | Fix broken testsFilipa Lacerda2017-02-031-0/+1
| | | | | |
| * | | | | Resolve conflict after mergeFilipa Lacerda2017-02-0342-90/+92
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0320-42/+97
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Backport changes from EE squash replace `find_with_namespace` with `find_by_full_path` PlantUML support for Markdown Update api docs and minor changes Force new password after password reset via API Fixed protected branches dropdown Fixed up tests Fixed the active branch selected indicator Changed how the data is returned - we only care about the branch/tag name Uses take rather than Kaminari Use cloneNode instead of createElement Improved ref switcher dropdown performance
| * | | | | | | Only load pipelines vue component when there are pipelines.Filipa Lacerda2017-02-034-33/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Empty state to vue component
| * | | | | | | Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-035-8/+42
| | | | | | | |
| * | | | | | | Serialize pipelines in the new merge request actionGrzegorz Bizon2017-02-031-1/+8
| | | | | | | |
| * | | | | | | Fix syntax error in the new merge request viewGrzegorz Bizon2017-02-031-1/+1
| | | | | | | |
View Lorry Controller Status