summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add the version each feature was introduced and remove notegithub_importerAchilleas Pipinellis2016-01-151-11/+8
|
* Merge branch 'fix-autocomplete-new-issues' into 'master' Robert Speicher2016-01-153-2/+3
|\ | | | | | | | | | | | | Fix autocomplete for new issues/MRs/snippets Fixes gitlab-org/gitlab-ce#8067 See merge request !2446
| * Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issuesYorick Peterse2016-01-153-2/+3
| |
* | Merge branch 'fix-alignment-issue' into 'master' Jacob Schatz2016-01-1510-23/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment issues after a fix on titles weight Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/ ## Commit title alignment fixed ![Screen_Shot_2016-01-14_at_16.10.01](/uploads/8fdc08dca379bc551f5872de910c7149/Screen_Shot_2016-01-14_at_16.10.01.png) **The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).** ## Tags name in list ![Screen_Shot_2016-01-14_at_16.10.09](/uploads/fba3978037677bb8855f374b5f38dde0/Screen_Shot_2016-01-14_at_16.10.09.png) See merge request !2431
| * | Replace strong by span for .item-title elementsfix-alignment-issueRémy Coutable2016-01-155-6/+6
| | |
| * | Remove unnecessary classRémy Coutable2016-01-151-4/+0
| | |
| * | Streamline item titles to use a single class, and add back strong tagsRémy Coutable2016-01-159-20/+12
| | |
| * | Fix alignment issues after a fix on titles weightRémy Coutable2016-01-144-7/+6
| | |
* | | Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-159-19/+121
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the CI runner know about builds that this build depends on This allows us to implement artifacts passing: runner will download artifacts from all prior builds. It will happen automatically, and always, as long as artifacts are enabled. ## The changes: This MR exposes list of prior builds in CI::API::Builds. **The API response when asking for builds** ```json { "id": 48584, "ref": "0.1.1", "tag": true, "sha": "d63117656af6ff57d99e50cc270f854691f335ad", "status": "success", "name": "pages", "token": "9dd60b4f1a439d1765357446c1084c", "stage": "test", "project_id": 479, "project_name": "test", "commands": "echo commands", "repo_url": "http://gitlab-ci-token:token@gitlab.example/group/test.git", "before_sha": "0000000000000000000000000000000000000000", "allow_git_fetch": false, "options": { "image": "docker:image", "artifacts": { "paths": [ "public" ] }, "cache": { "paths": [ "vendor" ] } }, "timeout": 3600, "variables": [ { "key": "CI_BUILD_TAG", "value": "0.1.1", "public": true } ], "dependencies": { "builds": [ { "id": 48584, "ref": "0.1.1", "tag": true, "sha": "d63117656af6ff57d99e50cc270f854691f335ad", "status": "success", "name": "build", "token": "9dd60b4f1a439d1765357446c1084c", "stage": "build", "project_id": 479, "project_name": "test", "artifacts_file": { "filename": "artifacts.zip", "size": 0 } } ] } } ``` ## How it will work? **Example:** ``` build: type: build script: - echo TEST > test_file artifacts: untracked: true rspec: type: test script: - test-my-project staging: type: deploy script: - scp test_file root@server.com: ``` **The flow:** 1. We run `build`. The `build` creates a file `test_file`. This file gets archived and send us build artifacts. 2. We run `rspec`. The `rspec` downloads build artifacts from `build`. Uses the `test_file`. 3. We run `staging`. The `staging` downloads build artifacts from `build` and `rspec`, but since the `rspec` doesn't have build artifacts we skip that build. Deploys the `test_file`. This partially implements the https://gitlab.com/gitlab-org/gitlab-ce/issues/3423. In the next release we will introduce option to configure what artifacts are received. /cc @grzesiek @DouweM @sytse @rspeicher See merge request !2437
| * | | Change dependencies.builds to depends_on_buildsKamil Trzcinski2016-01-153-25/+21
| | | |
| * | | Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-149-19/+125
| | | | | | | | | | | | | | | | This allows us to implement artifacts passing: runner will download artifacts from all prior builds
* | | | Merge branch 'feature/allow-artifacts-for-reporters' into 'master' Douwe Maan2016-01-1513-30/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow access to artifacts for users with reporter role This is originally introduced by @ajohnsn in this merge request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2259 I've added and refactored specs, original commit by @ajohnsn has been cherry picked here. See merge request !2448
| * | | | Add Changelog entry for new permissions for build artifactsGrzegorz Bizon2016-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Add feature tests for permissions for build artifacts read abilityfeature/allow-artifacts-for-reportersGrzegorz Bizon2016-01-157-12/+57
| | | | |
| * | | | Fix nonexistent method in artifacts controllerGrzegorz Bizon2016-01-151-1/+1
| | | | |
| * | | | Expand builds namespace for feature tests in spinachGrzegorz Bizon2016-01-154-15/+27
| | | | |
| * | | | Give reporters the ability to download artifacts.Andrew Johnson2016-01-153-4/+4
| | |_|/ | |/| | | | | | | | | | Also fix a few places where page_404 should be render_404.
* | | | Merge branch 'no-mail-during-dev-bootstrap' into 'master' Jacob Vosmaer2016-01-151-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send (fake) email during dev bootstrap This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener email popups in your browser. In the latest GDK we automatically set BOOTSTRAP=1 during `make`. [ci skip] See merge request !2447
| * | | | Don't send (fake) email during dev bootstrapno-mail-during-dev-bootstrapJacob Vosmaer2016-01-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener emai popups in your browser.
* | | | | Merge branch 'simplify-procfile' into 'master' Jacob Vosmaer2016-01-153-6/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify Procfile These changes are meant to make development easier. [ci skip] See merge request !2429
| * | | | | Direct sidekiq boot output to log filesimplify-procfileJacob Vosmaer2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This behavior got lost in the previous commit.
| * | | | | Remove duplication in ProcfileJacob Vosmaer2016-01-141-2/+2
| | | | | |
| * | | | | Improve bin/ launchersJacob Vosmaer2016-01-142-3/+15
| |/ / / /
* | | | | Merge branch 'fixKerberosSignUp' into 'master' Drew Blessing2016-01-152-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix signup using kerberos kerberos only provides a username and an email, but no name. Therefore a signup fails because the name is empty. Best guess for the name is probably the username, therefore use it as name. I also created an issue for this: #5945 See merge request !2336
| * | | | | Fix signup for some OAuth providersSteffen Köhler2016-01-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some OAuth providers (kerberos for example) only provide a username and an email, but no name. Therefore a signup fails because the name is empty. Best guess for the name is probably the username, therefore use it as name.
* | | | | | Merge branch 'issue_7975' into 'master' Drew Blessing2016-01-151-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider that URL can end with '/' before redirecting. Closes #7975 See merge request !2416
| * | | | | Consider that URL can end with '/' before redirecting. #7975issue_7975Rubén Dávila2016-01-131-1/+1
| | | | | |
* | | | | | Merge branch 'doc_github_import' into 'master' Douwe Maan2016-01-155-10/+36
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor GitHub importer documentation To be merged when gitlab-org/gitlab-ce!2324 is finished. See merge request !2390
| * | | | | Refactor GitHub importer documentationdoc_github_importAchilleas Pipinellis2016-01-125-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch ↵Robert Speicher2016-01-151-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'deleting-a-note-after-editing-another-results-in-a-javascript-error' into 'master' Fix javascript error with deleting messages in issue or merge request Elements searched for by jQuery no longer existed in the DOM. Javascript was also unnecessarily complex, for using jQuery Fixes #8109 See merge request !2442
| * | | | | | Fix javascript error with deleting messages in issue or merge requestdeleting-a-note-after-editing-another-results-in-a-javascript-errorJacob Schatz2016-01-141-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Elements searched for by jQuery no longer existed in the DOM. Javascript was also unnecessarily complex, for using jQuery Fixes #8109
* | | | | | | Update CHANGELOGRobert Speicher2016-01-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving 8.5 change to 8.4 since we're merging master into stable for now. [ci skip]
* | | | | | | Merge branch 'rs-woff2' into 'master' Robert Speicher2016-01-1413-4/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer custom WOFF2 fonts if the browser supports them [ci skip] See merge request !2443
| * | | | | | | Prefer custom WOFF2 fonts if the browser supports themRobert Speicher2016-01-1413-4/+20
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'ci/api-triggers' into 'master' Kamil Trzciński2016-01-148-6/+326
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add triggers API References #4264 See merge request !2286
| * | | | | | Update CHANGELOGci/api-triggersTomasz Maczukin2016-01-141-2/+1
| | | | | | |
| * | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-14217-1063/+3225
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (150 commits) fixes margin and padding Update mailroom/postfix documentation [ci skip] Fix css mess around git clone panel. Align it properly Fix missing padding for user/group pages Fix parse_gollum_tags matcher Update documentation on Banzai::Filter::GollumTagsFilter Add tests for the wiki pipeline Refactoring Banzai::Filter::GollumTagsFilter Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter Remove GollumTagsPipeline Refactoring Gitlab::GithubImport::Importer Remove unnecessary brackets on WIKI_SLUG_ID route constraints Move js function to removing accents to vendor/assets/javascripts Update CHANGELOG Use the WikiPipeline when rendering the wiki markdown content Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML Relax constraints for wiki slug Import GitHub wiki into GitLab Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus Revert changes to how the notes are paginated in the API ... Conflicts: doc/api/README.md lib/api/entities.rb
| * | | | | | | Modify entry in CHANGELOGTomasz Maczukin2016-01-141-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1420-10/+463
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix version Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Modify builds API documentation style [ci skip] Modify :ci_variable factory Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add some fixes after review Remove blank line Update ./doc/api Change :variable_id to :key as resource ID in API Fix a typo in method description Add create feature to variables API Add missing 'not_found' checks in variables API Add delete feature to variables API Add update feature for variables API Add features for list and show details of variables in API Conflicts: doc/api/README.md lib/api/entities.rb
| * | | | | | | | Fix versionTomasz Maczukin2016-01-141-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1454-230/+931
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (32 commits) Fix specs and rubocop warnings fixed LDAP activation on login to use new ldap_blocked state Fix Admin/Users view to position buttons without spacing magic Update to Go 1.5.3 Fix the undefinded variable error in Project's safe_import_url method Fix misaligned edit button in milestone collection partial Update button styles for Milestones#show Ensure the API doesn't return notes that the current user shouldn't see Add spec for Note#cross_reference_not_visible_for? Remove (invalid) timestamp formatting Move `BroadcastMessage#status` to a helper since it's presentational Update CHANGELOG Broadcast Messages can now be edited Update Broadcast Message features Update BroadcastMessage model Update broadcast_message helper Simplify BroadcastMessage factory Simplify broadcast message JS Remove alert_type attribute from BroadcastMessage Move broadcast message form to a partial ...
| * | | | | | | | | Add mofications to triggers API documentation [ci skip]Tomasz Maczukin2016-01-141-32/+12
| | | | | | | | | |
| * | | | | | | | | Update CHANGELOG [ci skip]Tomasz Maczukin2016-01-141-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch '8-4-stable' into ci/api-triggersTomasz Maczukin2016-01-14430-2642/+4839
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (280 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
| * | | | | | | | | | Modify triggers API documentation style [ci skip]Tomasz Maczukin2016-01-143-91/+129
| | | | | | | | | | |
| * | | | | | | | | | Add some fixes after reviewTomasz Maczukin2016-01-134-19/+16
| | | | | | | | | | |
| * | | | | | | | | | Change 'trigger_id' to 'token' as resource ID in triggers APITomasz Maczukin2016-01-074-54/+27
| | | | | | | | | | |
| * | | | | | | | | | Update ./doc/apiTomasz Maczukin2016-01-072-0/+95
| | | | | | | | | | |
| * | | | | | | | | | Get show details feature to triggers APITomasz Maczukin2016-01-052-5/+77
| | | | | | | | | | |
| * | | | | | | | | | Add create feature to triggers APITomasz Maczukin2016-01-052-0/+45
| | | | | | | | | | |