summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CI runs lint on shell scripts in lib/supportjej-lint-scripts-and-configJames Edwards-Jones2017-02-073-0/+53
|
* Merge branch 'jej-fix-backup-rake-color' into 'master'Sean McGivern2017-02-071-6/+6
|\ | | | | | | | | Fixed backup.rake colorize method following Pages -> CE See merge request !9031
| * Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-colorConnor Shea2017-02-071-6/+6
| | | | | | Cherry-picked 'Remove colorize methods that weren't in CE.'
* | Merge branch '8082-permalink-to-file' into 'master' Alfredo Sumaran2017-02-077-32/+87
|\ \ | | | | | | | | | | | | | | | | | | Add keyboard shortcut to move to file permalink `y` Closes #8082 See merge request !8799
| * | Add keyboard shortcut to move to file permalink8082-permalink-to-fileEric Eastwood2017-02-067-32/+87
| | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/8082
* | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-0720-32/+400
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
| * | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-0720-32/+400
| | | |
* | | | Merge branch 'remove-deploy-key-endpoint' into 'master' Rémy Coutable2017-02-076-89/+383
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deploy key endpoint Closes #20569 See merge request !8716
| * | | | Remove /projects/:id/keys/.. endpointsRobert Schilling2017-02-076-89/+383
| | | | |
* | | | | Merge branch '27632_fix_mr_widget_url' into 'master'Sean McGivern2017-02-073-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR widget url Closes #27632 See merge request !8989
| * | | | | Fix MR widget urlJarka Kadlecova2017-02-073-6/+12
| | | | | |
* | | | | | Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in init.d/gitlab after Pages -> CE Closes #27785 See merge request !9026
| * | | | | | Fix syntax error in init.d/gitlab after Pages -> CEDrew Blessing2017-02-071-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | Cherry-picked ‘Fix syntax error in conditional statement’
* | | | | | Merge branch 'update-gitignore-templates' into 'master' James Lopez2017-02-0724-179/+141
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update .gitignore templates See merge request !9015
| * | | | | | Update .gitignore templatesupdate-gitignore-templatesRuben Davila2017-02-0724-179/+141
| | | | | | |
* | | | | | | Merge branch 'update-guides' into 'master' James Lopez2017-02-072-2/+241
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Update guides for 8.17 version See merge request !9014
| * | | | | | Update guides for 8.17 versionupdate-guidesRuben Davila2017-02-062-2/+241
| |/ / / / /
* | | | | | Merge branch 'api-remove-snippets-expires-at' into 'master'Sean McGivern2017-02-0712-88/+416
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
| * | | | | Split V3 entities into a separate fileapi-remove-snippets-expires-atRobert Schilling2017-02-076-93/+95
| | | | | |
| * | | | | Remove deprecated 'expires_at' from project snippets APIRobert Schilling2017-02-078-17/+343
| | | | | |
* | | | | | Merge branch 'fix/import-group-members' into 'master' Rémy Coutable2017-02-0710-13/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0710-13/+124
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'docs/fix-broken-links' into 'master' Achilleas Pipinellis2017-02-0746-65/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken links to docs See merge request !9022
| * | | | | | Fix broken links to docsAchilleas Pipinellis2017-02-0646-65/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'fix/grape-routes' into 'master' James Lopez2017-02-071-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Grape routes to work with current version of Grape See merge request !8992
| * | | | | | | added missed commit in rebaseJames Lopez2017-02-071-3/+1
| | | | | | | |
| * | | | | | | update Grape routes to work with current version of GrapeJames Lopez2017-02-071-1/+7
| | | | | | | |
* | | | | | | | Merge branch 'issue_19262' into 'master' Sean McGivern2017-02-073-0/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow system notes for closed issuables Closes #19262 See merge request !8848
| * | | | | | | | Disallow system notes for closed issuablesissue_19262Felipe Artur2017-02-063-0/+44
| | | | | | | | |
* | | | | | | | | Merge branch '26920-hover-cursor-on-pagination-element' into 'master' Filipa Lacerda2017-02-072-0/+18
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Mouse text cursor above pagination elements" Closes #26920 See merge request !9003
| * | | | | | | | adds changelog26920-hover-cursor-on-pagination-elementNur Rony2017-02-071-0/+4
| | | | | | | | |
| * | | | | | | | fixes cursor issue on pipeline paginationNur Rony2017-02-071-0/+14
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch ↵Kamil Trzciński2017-02-0723-63/+209
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | Fixed variables_controller_spec.rb test26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pagesJose Ivan Vargas2017-02-061-2/+1
| | | | | | | | |
| * | | | | | | | 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-063-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-3/+29
| | | | | | | | |
| * | | | | | | | Added a variable_controller_spec test to test for flash messages on the ↵Jose Ivan Vargas2017-02-062-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #create action
| * | | | | | | | 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-068-6/+28
| | | | | | | | |
| * | | | | | | | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-0613-34/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-5/+17
| | | | | | | | |
| * | | | | | | | 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-062-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ci_cd_pipelines_settings controller
| * | | | | | | | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-062-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-068-13/+13
| | | | | | | | |
| * | | | | | | | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-0612-41/+58
| | | | | | | | |
View Lorry Controller Status