summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2160-192/+766
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab CI Yaml template dropdown ## What does this MR do? Make it possible to select a dropdown for an easy start with GitLab CI. ## What are the relevant issue numbers? Closes #17521 ## TODO - [ ] Backend - [x] CHANGELOG item - [x] Fix rubocop failure - [x] API Support - [x] New tests - [x] Add disclaimer to the top of the gitlab-ci.yml - [ ] Frontend - [x] New tests See merge request !4411
| * | | | | | | | | | | | | Add button to add .gitlab-ci.yml file17521-gitlab-ci-yml-templatesAlfredo Sumaran2016-06-201-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add feature test for gitab CI dropdownAlfredo Sumaran2016-06-201-0/+30
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Incorporate reviewZ.J. van de Weg2016-06-208-17/+34
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Run rake gitlab:update_templatesZ.J. van de Weg2016-06-2024-19/+160
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-202-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add GitLab CI Yml dropdown selectorAlfredo Sumaran2016-06-205-2/+42
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-208-80/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit builds on the groundwork in ee008e300b1ec0abcc90e6a30816ec0754cea0dd, which refactored the backend so the same code could be used for new dropdowns. In this commit its used for templates for the `.gitlab-ci.yml` files.
| * | | | | | | | | | | | | Add first templates for gitlab-ci dropdownZ.J. van de Weg2016-06-2015-0/+256
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-2012-143/+183
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'feature/runner-lock-on-project' into 'master' RĂ©my Coutable2016-06-2125-129/+431
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to lock runner on a specific project Make it possible to lock runner on a specific project. ![Screen_Shot_2016-06-20_at_4.03.08_PM](/uploads/186378643a20106ff0b67b6fd8bd7f28/Screen_Shot_2016-06-20_at_4.03.08_PM.png) ---- ![Screen_Shot_2016-06-20_at_9.54.52_PM](/uploads/c479abdffaf19f383bb6b5a42bdd6cc3/Screen_Shot_2016-06-20_at_9.54.52_PM.png) ---- ![Screen_Shot_2016-06-20_at_9.56.26_PM](/uploads/6ad838679b0c28a1fe2e20e9224387ea/Screen_Shot_2016-06-20_at_9.56.26_PM.png) Closes #3407 See merge request !4093
| * | | | | | | | | | | | | Update wordings according to:Lin Jen-Shin2016-06-213-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12594802
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵feature/runner-lock-on-projectLin Jen-Shin2016-06-2010-14/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: Add notification_settings:events to schema Fixed mobile styling Set path for pinned nav cookie Fixed placement of close button on merge requests using request dot path instead Turn note into normal text Document environments and deployments Tweak grammar fix double query string in url Broken instructions. git fetch --all --tags doesn't refresh tags
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-20223-825/+11032
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (353 commits) Put some admin settings in dropdown Add styleguide on configuration settings documentation Remove Duplicated keys add UNIQUE index to fingerprint Avoid autoload issue such as 'Mail::Parsers::AddressStruct' Move appearance settings as sub tab to application settings use rails root join fixed a couple of errors spotted in production Fix RangeError exceptions when referring to issues or merge requests outside of max database values Fix bug in `WikiLinkFilter`. Grammar and typographic changes to artifacts documentation Tweak grammar Small frontend code fixes and restore 8a2d88f commit Warn about admin privilege to disable GitHub Webhooks Listing GH Webhooks doesn't stop import process for non GH admin users fixup! updated docs for api endpoint award emoji Update CHANGELOG Ensure Todos counters doesn't count Todos for projects pending delete Add endpoints for award emoji on notes Sort API endpoints and implement feedback Add endpoints for Award Emoji ...
| * | | | | | | | | | | | | Add index for ci_runners.locked, feedback:Lin Jen-Shin2016-06-202-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12571602 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12571670
| * | | | | | | | | | | | | Rename according to:Lin Jen-Shin2016-06-205-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12563922 For clarification and consistency
| * | | | | | | | | | | | | Use .has-tooltip as suggested at:Lin Jen-Shin2016-06-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12533926
| * | | | | | | | | | | | | Test for enabling/disabling runners from admin runner pageLin Jen-Shin2016-06-172-2/+36
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-172-6/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-17418-3054/+16656
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (337 commits) Update CHANGELOG for !4659 Center the header logo for all Devise emails Add previews for all customized Devise emails Customize the Devise `unlock_instructions` email Customize the Devise `reset_password_instructions` email Customize the Devise `password_change` emails Use gitlab-git 10.2.0 Use Git cached counters on project show page Fix indentation scss-lint errors Added title attribute to enties in tree view Closes #18353 Banzai::Filter::ExternalLinkFilter use XPath Reduce queries in IssueReferenceFilter Use gitlab_git 10.1.4 Fixed ordering in Project.find_with_namespace Fix images in emails Banzai::Filter::UploadLinkFilter use XPath Turn Group#owners into a has_many association Make project_id nullable CHANGELOG [ci skip] CHANGELOG [ci skip] ...
| * | | | | | | | | | | | | | Use active tense, feedback from:test-merge-request-4093Lin Jen-Shin2016-06-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12501303
| * | | | | | | | | | | | | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Again! For admin.
| * | | | | | | | | | | | | | blank line between setup and expectation, feedback:Lin Jen-Shin2016-06-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093/diffs#note_12501266 and: https://robots.thoughtbot.com/four-phase-test
| * | | | | | | | | | | | | | Use FIXME instead, feedback from:Lin Jen-Shin2016-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093/diffs#note_12501400
| * | | | | | | | | | | | | | Use font awesome instead of Unicode. Feedback from:Lin Jen-Shin2016-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/commit/53121601f38155e926eed300160f79dd4bc0768b#note_12465224
| * | | | | | | | | | | | | | Adopt the rename from ci_commits to ci_pipelinesLin Jen-Shin2016-06-152-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-151-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-144-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4641#note_12444891
| * | | | | | | | | | | | | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-projectLin Jen-Shin2016-06-144-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prefer-assign_to: Give 409 Conflict whenever the runner was already enabled We're checking return value rather than rescuing exceptions Prefer Runner#assign_to instead of creating directly
| | * | | | | | | | | | | | | | Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-144-4/+8
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | We're checking return value rather than rescuing exceptionsLin Jen-Shin2016-06-141-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Prefer Runner#assign_to instead of creating directlyLin Jen-Shin2016-06-141-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-14582-1513/+3372
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (147 commits) Update CHANGELOG Remove deprecated issues_tracker and issues_tracker_id from project Schema doesn’t reflect the changes of the last 3 migrations Revert CHANGELOG Also rename "find" in the specs Change to new Notes styleguide Add guide on changing a document's location Change logs.md location in README Move logs/logs.md to administration/logs.md Make "four phase test" Only show branches for revert / cherry-pick Instrument all Banzai::ReferenceParser classes Removed old comment from update_column_in_batches Update columns in batches until no rows are left Remove counters from Pipeline navigation Handle NULL migration errors in migration helpers Fix typo causing related branches to Error 500 Improved SVG sanitizer specs to include smoke tests for clean. Refactored SVG sanitizer Added SVG sanitizer fix to the changelog ...
| * | | | | | | | | | | | | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-144-2/+18
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename specific_for to available_for:Lin Jen-Shin2016-06-143-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12413950
| * | | | | | | | | | | | | | | Add a small locked icon if it's locked:Lin Jen-Shin2016-06-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is probably not the way we add icons, but well. Not sure if this should be put next to the status icon or edit icon, my first thought was put this next to status, but it looks a bit better next to edit button. Please tweak this accordingly. I don't have strong opinion regarding views. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12345567
| * | | | | | | | | | | | | | | Tweak the wordings and grammar slightlyLin Jen-Shin2016-06-091-5/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Updated doc description according to feedback:Lin Jen-Shin2016-06-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12345562
| * | | | | | | | | | | | | | | Updated description for the formLin Jen-Shin2016-06-091-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Extra tests inside shared_examples:Lin Jen-Shin2016-06-091-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12321421 The advantage of this is that tests are less about logic and more straightforward, thus could be easier to reason about each individual tests. The disadvantage of this is that we write more duplicated codes and once something changed we might need to change all places and it's harder to reason all tests as a whole. Because now we need to look at more places to figure out how it should work under another option!
| * | | | | | | | | | | | | | | Merge conditions. Not worth an additional pointless method:Lin Jen-Shin2016-06-091-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12321267
| * | | | | | | | | | | | | | | Renamed to available_for? Feedback from:Lin Jen-Shin2016-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12321240
| * | | | | | | | | | | | | | | Remove Build#can_be_served? and rename Runner#can_serve? to can_pick?Lin Jen-Shin2016-06-095-124/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also moves tests from build_spec.rb to runner_spec.rb
| * | | | | | | | | | | | | | | Prefer string for describe, feedback from:Lin Jen-Shin2016-06-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12321029
| * | | | | | | | | | | | | | | Update CHANGELOG and doc for locked runner featureLin Jen-Shin2016-06-092-0/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed a typo (remove extra n)Lin Jen-Shin2016-06-091-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Manually build the SQL so that it properly skips Rails.Lin Jen-Shin2016-06-091-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Found a workaround for that weird SQL error:Lin Jen-Shin2016-06-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without that, Rails would complain: > bind message supplies 5 parameters, but prepared statement "a4" requires 4 However without this workaround it would still work in Rails console, so I still think this is a Rails bug somewhere.
| * | | | | | | | | | | | | | | Use block for before/after as we preferredLin Jen-Shin2016-06-091-22/+67
| | | | | | | | | | | | | | | |