summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Incorporate feedbackZeger-Jan van de Weg2015-12-057-31/+84
|
* Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-029-25/+234
|
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1878-429/+2934
|\
| * Add tests for merge request update.Douwe Maan2015-11-172-5/+8
| |
| * Fix specDouwe Maan2015-11-171-4/+6
| |
| * Merge branch 'master' into adamliesko/gitlab-ce-notification-upon-unassignmentDouwe Maan2015-11-1754-307/+1672
| |\
| | * Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-172-0/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
| | | * Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-162-0/+9
| | | | | | | | | | | | | | | | | | | | This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
| | * | Merge branch 'rs-wiki-touches-project' into 'master' Douwe Maan2015-11-171-0/+18
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ProjectWiki touch Project#last_activity_at after wiki actions Closes #3026 See merge request !1803
| | | * | Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-projectRobert Speicher2015-11-161-0/+18
| | | |/ | | | | | | | | | | | | Closes #3026
| | * | Merge branch 'global-milestones' into 'master' Dmitriy Zaporozhets2015-11-164-70/+117
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create milestones in the group When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so For #3488 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1797
| | | * Lets add more tests to Milestones servicesDmitriy Zaporozhets2015-11-162-0/+52
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * Move global milestone specsDmitriy Zaporozhets2015-11-162-70/+65
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Merge branch 'ci-runners-master-or-owner' into 'master' Dmitriy Zaporozhets2015-11-161-1/+11
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show specific runners from projects where user is master or owner This fix for permission escalation when handling specific runners. The users were allowed to assign runners from projects where they were guests. See merge request !1809
| | | * Show specific runners from projects where user is master or ownerci-runners-master-or-ownerKamil Trzcinski2015-11-161-1/+11
| | | |
| | * | Add support for git lfs.lfsMarin Jankovski2015-11-163-0/+670
| | |/
| | * Merge branch 'releases-feature'Dmitriy Zaporozhets2015-11-162-75/+135
| | |\
| | | * Add api test for creating tag with release infoDmitriy Zaporozhets2015-11-121-0/+13
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * Expose release notes to tags apiDmitriy Zaporozhets2015-11-121-5/+25
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * Add releases apiDmitriy Zaporozhets2015-11-121-1/+14
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * Move git tags API to separate fileDmitriy Zaporozhets2015-11-122-75/+89
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-142-27/+38
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
| | | * | refactor login as to be impersonation with better login/logoutJames Newton2015-10-292-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.
| | * | | Merge branch 'annotate-models' into 'master' Dmitriy Zaporozhets2015-11-1420-19/+134
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotate models Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1799
| | | * | | Annotate modelsDmitriy Zaporozhets2015-11-1320-19/+134
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Merge branch 'builds_feature' into 'master' Kamil Trzciński2015-11-1312-105/+89
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose builds feature Expose builds feature in project settings (as feature). Enable it by default for a new projects. I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it. ![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png) If we are ok, I'll add feature tests for it. /cc @sytses @dzaporozhets See merge request !1767
| | | * | | Fix caching breaking test of build artifactsbuilds_featureKamil Trzcinski2015-11-131-6/+3
| | | | | |
| | | * | | Fix broken testsKamil Trzcinski2015-11-136-89/+43
| | | | | |
| | | * | | Expose CI enable option in project featuresKamil Trzcinski2015-11-136-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | - Enable CI by default for all new projects
| | * | | | Merge branch 'refactor-complex-methods' into 'master' Dmitriy Zaporozhets2015-11-131-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor complex methods Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50 Part of #3444 See merge request !1794
| | | * | | Move spec to proper place and fix unused variablerefactor-complex-methodsDmitriy Zaporozhets2015-11-131-0/+0
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Add ignore white space option in merge request diffMinsik Yoon2015-11-132-0/+44
| | |/ / | | | | | | | | | | | | | | | | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
| | * | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets2015-11-122-9/+0
| | |\ \ | | | | | | | | | | Avoid render edit_form in each notes.
| | | * | Avoid render edit_form in each notes.Jason Lee2015-11-122-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).
| | * | | Merge branch 'caches' into 'master' Kamil Trzciński2015-11-121-0/+82
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to define cache in `.gitlab-ci.yml` This extends `.gitlab-ci.yml` syntax to allow specifying caching files and directories between builds, making it easy to preserve ex. gems. ``` cache: paths: - .bundle - vendor/ before_script: - bundle install --path vendor/ rspec: script: - bundle exec rspec ``` This is based on Build Artifacts changes. /cc@dzaporozhets See merge request !1786
| | | * | | Allow to define cache in `.gitlab-ci.yml`cachesKamil Trzcinski2015-11-101-0/+82
| | | | | |
| | * | | | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-117-15/+312
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Build Artifacts This implements #3028 1. It stores artifacts in shared/artifacts, 1. It adds `artifacts` to `.gitlab-ci.yml`, 1. We use GitLab Workhorse to offload artifacts uploading, 1. To download artifacts it uses GitLab Workhorse X-Sendfile extension, 1. There's one "artifact" per-build. The new upload removes previous one and creates a new one, 1. Default max artifact size is set to 100MB - this can be changed in settings. Missing things: 1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files, 1. Artifacts passing between builds. GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5 GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46 Syntax: ``` artifacts: untracked: true # default: false paths: # default: empty - bin/files ``` See merge request !1584
| | | * | | Fix testsartifactsKamil Trzcinski2015-11-101-2/+2
| | | | | |
| | | * | | Use normal file upload mechanism to upload artifactsKamil Trzcinski2015-11-101-8/+17
| | | | | |
| | | * | | Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse nowKamil Trzcinski2015-11-101-1/+1
| | | | | |
| | | * | | Change artifacts syntax to allow uploading untracked filesKamil Trzcinski2015-11-101-5/+18
| | | | | |
| | | * | | Implement Build ArtifactsKamil Trzcinski2015-11-107-15/+290
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
| | * | | Merge branch 'add-allow-failure-status' into 'master' Stan Hu2015-11-101-1/+3
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Add allow_failure field to commit status API Closes #3196 See merge request !1685
| | | * | Add allow_failure field to commit status APIStan Hu2015-11-031-1/+3
| | | | | | | | | | | | | | | | | | | | Closes #3196
| | * | | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-102-0/+25
| | |\ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | Add tests to release notes featureDmitriy Zaporozhets2015-11-062-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | Add release modelDmitriy Zaporozhets2015-11-052-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add notification to the former assignee upon unassignmentadamliesko2015-11-091-4/+6
| |/ / / /
| * | | | Track the amount of times views are renderedYorick Peterse2015-11-091-0/+57
| | | | |
| * | | | Fixed Hash key style in Sherlock::Query specYorick Peterse2015-11-091-1/+1
| | | | |