summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | add CHANGELOG.md entry for !9055replace-npm-with-yarnMike Greiling2017-02-141-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | fix eslint builds within .gitlab-ci.ymlMike Greiling2017-02-141-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | update yarn.lock to reflect latest package.jsonMike Greiling2017-02-131-602/+1016
| | | | | | | | | | | |
| * | | | | | | | | | | add yarn check to ensure package.json doesn't diverge from yarn.lockMike Greiling2017-02-131-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | display yarn version and node version within CI logsMike Greiling2017-02-131-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | add yarn lock fileMike Greiling2017-02-131-0/+3914
| | | | | | | | | | | |
| * | | | | | | | | | | replace npm run calls with yarnMike Greiling2017-02-133-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | remove recursive npm calls to avoid dependence on npm after switch to yarnMike Greiling2017-02-131-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | remove unnecessary "npm install"sMike Greiling2017-02-131-5/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'eslint-resolve-webpack-modules' into 'master' Filipa Lacerda2017-02-142-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable eslint to resolve webpack modules according to webpack.config.js See merge request !9218
| * | | | | | | | | | | enable eslint to resolve webpack modules according to webpack.config.jseslint-resolve-webpack-modulesMike Greiling2017-02-142-4/+11
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dynamic-todos-fixture' into 'master' Clement Ho2017-02-145-6/+59
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for right_sidebar_spec.js See merge request !9211
| * | | | | | | | | | | Replace static fixture for right_sidebar_spec.js (!9211)winniehell2017-02-145-15/+38
| | | | | | | | | | | |
| * | | | | | | | | | | Add dynamic fixture for todoswinniehell2017-02-141-0/+30
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '27755-pipeline-docs' into 'master' Achilleas Pipinellis2017-02-143-0/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document types of pipelines Closes #22631 See merge request !9008
| * | | | | | | | | | | Add image description27755-pipeline-docsMark Pundsack2017-02-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add image titlesMark Pundsack2017-02-061-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add development workflowsMark Pundsack2017-02-062-1/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Update imageMark Pundsack2017-02-061-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add imageMark Pundsack2017-02-062-1/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Document types of pipelinesMark Pundsack2017-02-061-0/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into ↵Rémy Coutable2017-02-1410-2/+146
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Wiki page delete does not trigger the webhook" Closes #19302 See merge request !8198
| * | | | | | | | | | | | Execute web hooks for WikiPage delete operationMark Fletcher2017-02-145-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a new DestroyService for Wiki Pages * Alter WikiPagesController to use the new service
| * | | | | | | | | | | | Add tests for WikiPages servicesMark Fletcher2017-02-143-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Alter wiki_pages factory with custom creation operation
| * | | | | | | | | | | | Make WikiPage comparable according to StaticModel interfaceMark Fletcher2017-02-142-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add WikiPage#id method returning associated SHA for wiki page commit
* | | | | | | | | | | | | Merge branch '23061-consolidate-project-lists' into 'master' Sean McGivern2017-02-149-396/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: consolidate project lists Closes #23061 See merge request !8962
| * | | | | | | | | | | | API: Consolidate /projects endpointToon Claes2017-02-149-396/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It consolidates these endpoints: - /projects - /projects/owned - /projects/visible - /projects/starred - /projects/all Into the /projects endpoint using query parameters.
* | | | | | | | | | | | | Merge branch '27656-doc-ci-enable-ci' into 'master' Achilleas Pipinellis2017-02-144-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc for enabling or disabling GitLab CI Closes #27656 See merge request !8965
| * | | | | | | | | | | | | Update doc for enabling or disabling GitLab CITakuya Noguchi2017-02-054-9/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '26286-most-recent-activity-profile-header' into 'master' Annabel Dunstone Gray2017-02-142-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Most Recent Activity' header to User Profile Closes #26286 See merge request !9189
| * | | | | | | | | | | | | | Add 'Most Recent Activity' header to the User Profile pageJan Christophersen2017-02-132-0/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'use-es6-promise-package' into 'master' Alfredo Sumaran2017-02-143-1158/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use es6-promise package to avoid webpack warnings See merge request !9215
| * | | | | | | | | | | | | | | Use es6-promise package to avoid webpack warningsuse-es6-promise-packageEric Eastwood2017-02-133-1158/+2
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/stefanpenner/es6-promise/issues/100 ``` [WDS] Warnings while compiling. ./vendor/assets/javascripts/es6-promise.auto.js Module not found: Error: Can't resolve 'vertx' in '/Users/eric/Documents/gitlab/gitlab-development-kit/gitlab/vendor/assets/javascripts' @ ./vendor/assets/javascripts/es6-promise.auto.js 140:16-26 @ ./app/assets/javascripts/application.js @ multi (webpack)-dev-server/client?http://localhost:3808 ./application.js ```
* | | | | | | | | | | | | | | Merge branch '27932-merge-request-pipelines-displays-json' into 'master' Alfredo Sumaran2017-02-143-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSON Closes #27932 See merge request !9105
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1029-245/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' " Fix broken test to use trigger in order to not take tooltip overlaping in consideration Fix job to pipeline renaming Replace teaspoon references with Karma Add changelog Only show MR widget graph if there are stages Fix tooltip scss for anchors. Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover moved hyperlink reference section at the end of the content adds changelog fixes frontend doc broken link
| * | | | | | | | | | | | | | | | Adds verification in case the endpoint already has `.json`Filipa Lacerda2017-02-102-2/+20
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1048-129/+418
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Added env external link and light web terminal spec Don't perform Devise trackable updates on blocked User records Remove orange caret icon from mr widget Add index to ci_trigger_requests for commit_id Show parent group members for nested group Make sure events have most properties defined Restore exposure of legend property for events Optionally make users created via the API set their password Removed duplicate "Visibility Level" label on New Project page
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-107-8/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: rspec_profiling: Discover the correct branch name in GitLab CI Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Make min width smaller for user settings
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-109-13/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove a transient failure from spec/requests/api/groups_spec.rb Update PROCESS.md Update MergeRequest API state_event option documentation Rename issuable to IssueBase
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1070-411/+404
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (32 commits) Fix contribution activity alignment Adds a null check to build notifications Add a spec for our custom GemFetcher cop add CHANGELOG.md entry for !9078 approve new dependencies update karma deps to work with webpack 2 upgrade to webpack 2.2.x add CHANGELOG.md entry for !9072 approve MIT license for wordwrap submodule fix failing karma test upgrade babel to v6 exclude node_modules from imports-loader wrapper Allow copying a created branch name to the clipboard. Uses shared vue resource interceptor Refactored diff notes Vue app Fix expand_collapse_diffs specs Update the rspec_profiling gem to 0.0.5 Fix menu link in CONTRIBUTING adds max-width only for new filter dropdown adds changelog ...
| * | | | | | | | | | | | | | | | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSONFilipa Lacerda2017-02-092-1/+5
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch '27924-set-max-width-mini-pipeline-text' into 'master' Filipa Lacerda2017-02-142-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set max width for text in mini pipeline graph Closes #27924 See merge request !9188
| * | | | | | | | | | | | | | | | | | | | | Set max width for text in mini pipeline graph27924-set-max-width-mini-pipeline-textSam Rose2017-02-142-1/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-inactive-default-email-services' into 'master' Lin Jen-Shin (godfat)2017-02-142-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inactive default email services See merge request !8987
| * | | | | | | | | | | | | | | | | | | | Use Gitlab::Database.with_connection_pool from !9192remove-inactive-default-email-servicesLin Jen-Shin2017-02-142-41/+24
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Disconnect the pool after doneLin Jen-Shin2017-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Use threads directly, introduce pool later:Lin Jen-Shin2017-02-142-53/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8987#note_22938402
| * | | | | | | | | | | | | | | | | | | | Revert "Bump schema to pass `rake db:setup`"Lin Jen-Shin2017-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2ed7cbc9b36b6ad9bcc714b271e98ead756b816.
| * | | | | | | | | | | | | | | | | | | | Introduce ThreadedConnectionPool for customized poolLin Jen-Shin2017-02-142-28/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we could reuse this pool for other migrations Feedback: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8987#note_22923350 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8987#note_22923365
| * | | | | | | | | | | | | | | | | | | | Bump schema to pass `rake db:setup`Lin Jen-Shin2017-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status