summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-exportJames Lopez2016-06-1619-59/+379
|\ | | | | | | | | | | | | feature/project-export # Conflicts: # app/models/ci/pipeline.rb
| * Merge branch 'remove-shell-env' into 'master' Douwe Maan2016-06-154-36/+12
| |\ | | | | | | | | | | | | | | | | | | Get rid of Gitlab::ShellEnv Remove obsolete code we once needed for Grack and satellites. See merge request !4673
| | * Get rid of Gitlab::ShellEnvJacob Vosmaer2016-06-154-36/+12
| | |
| * | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-152-0/+12
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environments and deployments This MR is a continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/17009. The current implementation is as follow: 1. We have two new tables: `environments` and `deployments`. 2. We have a new tab: `Environments` under `Pipelines` where you can see all you environments and add a new one. 3. We add a new option to `.gitlab-ci.yml` to track where we should create a deployment for environment. 4. If environment in `.gitlab-ci.yml` is specified it will create a deployment. **If environment does not exist it will be created.** (this got changed) 5. The deployment is always successful and shows the time of the action, in that case a build that presumably should do deployment. In the future we could extend deployment with statuses: success, failure. We could extend deployments with information that this is partial or full deployment. 6. User have to create environments that he will track first. 7. User can remove environments. 8. User can retry/rollback past deployment (in that case we retry past build). The new build when succeeds it will create a new deployment. 9. Currently environment have only one parameter: `name`. In the future it should have: `variables`, `credentials` and possibly `runners` and maybe other resources. 10. Currently deployment have this parameters: `sha`, `ref`, `deployable (in this case a build)`, `user (who triggered a deployment)`, `created_at`. The `.gitlab-ci.yml`: ``` deploy to production: stage: deploy script: dpl travis... environment: production ``` What needs to be done: - [x] Write initial implementation - [x] Improve implementation (@ayufan) - [x] Write tests (@ayufan) - [x] Improve UX of the forms (cc @markpundsack) - reviewed by @markpundsack - [x] Improve implementation of the views (cc @jschatz1) - done by @iamphill - [x] Write .gitlab-ci.yml documentation for `environments` - done by @ayufan - [ ] Write user documentation (@ayufan and @markpundsack) See merge request !4605
| | * Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-0/+6
| | |\ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-149-7/+303
| | |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/ci/gitlab_ci_yaml_processor.rb
| | * | | Validate environment name with regexKamil Trzcinski2016-06-141-0/+8
| | | | |
| * | | | Random selection now also works for MySQLseed-fu-award-emojiZ.J. van de Weg2016-06-151-0/+4
| | | | |
| * | | | Filter out classes without names in the samplerYorick Peterse2016-06-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't do a lot with classes without names as we can't filter by them, have no idea where they come from, etc. As such it's best to just ignore these.
| * | | | Merge branch '18449-instrument-grape-endpoints' into 'master' Yorick Peterse2016-06-141-1/+24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Instrument Grape API endpoints See merge request !4587
| | * | | | Instrument Grape Endpoint with Metrics::RackMiddleware18449-instrument-grape-endpointsPaco Guzman2016-06-141-1/+24
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generating the following tags Grape#GET /projects/:id/archive from Grape::Route objects like { :path => /:version/projects/:id/archive(.:format) :version => “v3”, :method => “GET” } Use an instance variable to cache raw_path transformations. This variable is only going to growth to the number of endpoints of the API, not with exact different requests We can store this cache as an instance variable because middleware are initialised only once
| * | | | Merge branch '18527-instrument-private-methods' into 'master' Yorick Peterse2016-06-141-4/+6
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Instrument private methods and instance private methods See merge request !4639
| | * | | Instrument private/protected methodsPaco Guzman2016-06-141-4/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | By default instrumentation will instrument public, protected and private methods, because usually heavy work is done on private method or at least that’s what facts is showing
| * | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-149-7/+305
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch '18528-cpu-time-instrumentation' into 'master' Yorick Peterse2016-06-141-4/+7
| | |\ | | | | | | | | | | | | | | | | Measure CPU time for instrumented methods See merge request !4640
| | | * Measure CPU time for instrumented methodsPaco Guzman2016-06-141-4/+7
| | |/ | |/|
| | * Merge branch 'refactor/ci-config-add-global-entry' into 'master' Rémy Coutable2016-06-148-3/+292
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Add global entry with before script to new CI config ## What does this MR do? This MR adds a new entries to a new CI config class. It is next refactoring step after !4462. See #15060 See merge request !4482
| | * Validate ci config entry value before processing nodesrefactor/ci-config-add-global-entryGrzegorz Bizon2016-06-142-8/+11
| | |
| | * Make method that composes ci config entry privateGrzegorz Bizon2016-06-142-7/+7
| | |
| | * Merge branch 'master' into refactor/ci-config-add-global-entryGrzegorz Bizon2016-06-134-78/+85
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (59 commits) Improved SVG sanitizer specs to include smoke tests for clean. Refactored SVG sanitizer Added SVG sanitizer fix to the changelog Refactor SVG sanitizer and prevent `xlink:href` to refer to external resources Fix SVG whitelisting to allow namespaced attributes Fix Error 500 when using closes_issues API with an external issue tracker Center layout navigation and remove icons Fix preferences_spec test Add back sidebar counters and username Only create the backup directory if it is local Fix safari logo loading animation safari bug Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container Update media queries Fix profile test Fix logo at all screen widths, update sidebar text Move tanuki icon to center of nav bar; keep nav closed by default; remove collapsed nav cookie Remove unused MergeRequest#gitlab_merge_status method Add CHANGELOG item for labels/milestones navigation change Render issues link on issues subnav unless you visit merge request controller Render only issues/mr in subnav depends on context ...
| | * | Simplify ci config node factoryGrzegorz Bizon2016-06-132-11/+6
| | | |
| | * | Duplicate CI config node factory on class levelGrzegorz Bizon2016-06-132-4/+6
| | | |
| | * | Add factory for fabricating new ci config nodesGrzegorz Bizon2016-06-103-21/+57
| | | |
| | * | Define ci entry accessor instead of method_missingGrzegorz Bizon2016-06-102-7/+6
| | | |
| | * | Simplify new ci config entry class interfaceGrzegorz Bizon2016-06-104-23/+14
| | | |
| | * | Rename method used to allow node in Ci configGrzegorz Bizon2016-06-102-5/+5
| | | |
| | * | Merge branch 'master' into refactor/ci-config-add-global-entryGrzegorz Bizon2016-06-109-74/+153
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (147 commits) Minor MR comment fixes. Update CHANGELOG for 8.8.4 and 8.8.5 Properly quote table name in Rake task for MySQL and PostgreSQL compatibility Checks based on whether data is loaded not undefined Checks for undefined when inserting autocomplete into textarea Ignore frequent emojis in search. Fixed tests CHANGELOG Improved the UX of issue & milestone date picker Change date format to be non zero padded in order to fix failing test Update method name for better understanding Add tests for dates on tooltips Fix local timeago on user dashboard Update CHANGELOG Toggling a task in a description with mentions doesn't creates a Todo Update CHANGELOG Fixed failing label subscribe test Tests update Updated subscribe icon Fixed failing tests ...
| | * | | Rename method that returns allowed nodes in Ci configGrzegorz Bizon2016-06-092-8/+8
| | | | |
| | * | | Add comments to new CI config classes and modulesGrzegorz Bizon2016-06-096-2/+35
| | | | |
| | * | | Do not require Ci config node to have a hash valueGrzegorz Bizon2016-06-092-4/+8
| | | | |
| | * | | Make it possible configure Ci entry descriptionGrzegorz Bizon2016-06-094-16/+18
| | | | |
| | * | | Extract method that composes new Ci config entryGrzegorz Bizon2016-06-091-3/+7
| | | | |
| | * | | Move new Ci config configurable DSL to concernGrzegorz Bizon2016-06-093-26/+49
| | | | |
| | * | | Rename BeforeScript to Script in new Ci configGrzegorz Bizon2016-06-082-2/+2
| | | | |
| | * | | Add minor improvements in new Ci config designGrzegorz Bizon2016-06-082-13/+28
| | | | |
| | * | | Delegate Ci config entry value to single methodGrzegorz Bizon2016-06-084-17/+32
| | | | |
| | * | | Merge branch 'master' into refactor/ci-config-add-global-entryGrzegorz Bizon2016-06-0818-58/+271
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (285 commits) Bump recaptcha gem to 3.0.0 to remove deprecated stoken support Load knapsack in Rakefile only when is bundled Add License Finder information to contribution acceptance criteria. Add LGPLv2 to license whiltelist Instrument `RepositoryCheck::SingleRepositoryWorker` manually Bump nokogiri to 1.6.8 Fix alignment of wiki top area Update charcoal theme colors Update nav link font size and spacing; fix hamburger icon Fix control btn position Remove todos count tests in nav Test impersonation using img data attribute instead of username Implement compact side nav Fix knapsack for master Align links and tabs Add scrolling tabs to code subnav Finish styling sub nav Updated colors Fixed failing tests CHANGELOG item ... Conflicts: lib/gitlab/ci/config.rb spec/lib/gitlab/ci/config_spec.rb
| | * | | | Implement script in Ci config and use in legacy oneGrzegorz Bizon2016-06-074-0/+23
| | | | | |
| | * | | | Add DSL for adding nodes in Ci config interfaceGrzegorz Bizon2016-06-074-12/+12
| | | | | |
| | * | | | Use Ci config validation helpers only where neededGrzegorz Bizon2016-06-074-28/+30
| | | | | |
| | * | | | Do not process new Ci config entry when invalidGrzegorz Bizon2016-06-071-2/+6
| | | | | |
| | * | | | Pass root Ci config entry to each subsequent entryGrzegorz Bizon2016-06-072-6/+6
| | | | | |
| | * | | | Add Ci config entry that implements Null ObjectGrzegorz Bizon2016-06-072-10/+29
| | | | | |
| | * | | | Do not process Ci config node when node is a leafGrzegorz Bizon2016-06-071-2/+8
| | | | | |
| | * | | | Use CI config errors from new processor in legacy oneGrzegorz Bizon2016-06-062-1/+5
| | | | | |
| | * | | | Collect errors from all nodes in new CI configGrzegorz Bizon2016-06-061-3/+15
| | | | | |
| | * | | | Validate new before script CI configuration entryGrzegorz Bizon2016-06-062-5/+10
| | | | | |
| | * | | | Extract CI config validation helpers to mixinGrzegorz Bizon2016-06-061-0/+26
| | | | | |
| | * | | | Implement CI configuration nodes tree processingGrzegorz Bizon2016-06-063-4/+28
| | | | | |
| | * | | | Rename ci config module that holds nodes to NodeGrzegorz Bizon2016-06-064-17/+18
| | | | | |