| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' | Kamil Trzciński | 2017-01-23 | 3 | -39/+142 |
| |\ | | | | | | | | | | | | | Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503 | ||||
| | * | Fix warnings argument memoization in CI/CD stagefeature/success-warning-icons-in-stages-builds | Grzegorz Bizon | 2017-01-19 | 1 | -5/+19 |
| | | | |||||
| | * | Add a default status const to common status concern | Grzegorz Bizon | 2017-01-18 | 1 | -0/+6 |
| | | | |||||
| | * | Improve readability of specs for pipeline stages | Grzegorz Bizon | 2017-01-18 | 1 | -39/+64 |
| | | | |||||
| | * | Pass memoizable warnings attribute to stage object | Grzegorz Bizon | 2017-01-18 | 1 | -5/+15 |
| | | | |||||
| | * | Add specs for two new methods defined in stage class | Grzegorz Bizon | 2017-01-11 | 1 | -0/+48 |
| | | | |||||
| * | | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' | Yorick Peterse | 2017-01-20 | 1 | -4/+23 |
| |\ \ | | | | | | | | | | | | | | | | | | | Record used SSH keys only once per day Closes #26877 See merge request !8655 | ||||
| | * | | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-day | Adam Niedzielski | 2017-01-20 | 1 | -4/+23 |
| | | | | | | | | | | | | | | | | Use Gitlab::ExclusiveLease to make sure that we enqueue Sidekiq job at most once per day for given key. | ||||
| * | | | Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IE | Rémy Coutable | 2017-01-20 | 3 | -121/+115 |
| |\ \ \ | |/ / |/| | | | | | | | | Use `:empty_project` in Project, User, MergeRequest, and MoveToProjectFinder specs See merge request !8648 | ||||
| | * | | Convert most MergeRequest model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -22/+22 |
| | | | | |||||
| | * | | Convert most User model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -45/+39 |
| | | | | |||||
| | * | | Convert most Project model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -54/+54 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 4 | -5/+81 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'wip-mr-from-commits' into 'master' | Sean McGivern | 2017-01-19 | 1 | -0/+28 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Mark MR as WIP when pushing WIP commits Closes #25036 See merge request !8124 | ||||
| | | * | | Mark MR as WIP when pushing WIP commits | jurre | 2017-01-19 | 1 | -0/+28 |
| | | | | | |||||
| | * | | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 1 | -0/+15 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480 | ||||
| | | * | | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | | * | | | Add Presentable concern | Rémy Coutable | 2017-01-18 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | Merge branch 'fix/external-status-badge-links' into 'master' | Kamil Trzciński | 2017-01-19 | 1 | -4/+29 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Link external commit status badges to target URLs Closes #25662 See merge request !8611 | ||||
| | | * | | | Add URL validations for generic commit statuses | Grzegorz Bizon | 2017-01-18 | 1 | -0/+7 |
| | | | | | | |||||
| | | * | | | Add specs for a new external build detailed status | Grzegorz Bizon | 2017-01-17 | 1 | -4/+22 |
| | | | | | | |||||
| | * | | | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' | Sean McGivern | 2017-01-19 | 1 | -1/+9 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notify the user who set auto-merge when merge is not possible Closes #23524 See merge request !8056 | ||||
| | | * | | | | Notify the user who set auto-merge when merge conflict occurs | twonegatives | 2017-01-14 | 1 | -1/+9 |
| | | | | | | | |||||
| * | | | | | | Fix specs | Kamil Trzcinski | 2017-01-19 | 1 | -5/+28 |
| | | | | | | | |||||
| * | | | | | | Add missing build_spec | Kamil Trzcinski | 2017-01-19 | 1 | -0/+10 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 58 | -2107/+3452 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' | Douwe Maan | 2017-01-18 | 8 | -87/+28 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cycle analytics stages (1st iteration) See merge request !7647 | ||||
| | | * | | | | | refactor fetcher and fixed specs | James Lopez | 2017-01-17 | 7 | -20/+20 |
| | | | | | | | | |||||
| | | * | | | | | Fix other spec failures | James Lopez | 2017-01-17 | 1 | -59/+0 |
| | | | | | | | | |||||
| | | * | | | | | Fix other spec failures | James Lopez | 2017-01-17 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | more refactoring and fixing old specs | James Lopez | 2017-01-17 | 8 | -16/+16 |
| | | | |/ / / | | |/| | | | |||||
| | * | | | | | Merge branch 'time-tracking-api' into 'master' | Sean McGivern | 2017-01-18 | 1 | -5/+5 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time tracking API Closes #25861 See merge request !8483 | ||||
| | | * | | | | | Add some API endpoints for time tracking. | Ruben Davila | 2017-01-18 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New endpoints are: POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_estimate" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_time_estimate" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/add_spent_time" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_spent_time" GET :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_stats" | ||||
| | * | | | | | | Merge branch '26773-fix-project-statistics-repository-size' into 'master' | Rémy Coutable | 2017-01-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wrong file size on repository page" Closes #26773 See merge request !8616 | ||||
| | | * | | | | | | Fix Project#update_repository_size to convert MB to Bytes properly26773-fix-project-statistics-repository-size | Oswaldo Ferreira | 2017-01-17 | 1 | -1/+1 |
| | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | | Merge branch 'backport-time-tracking-ce' into 'master' | Douwe Maan | 2017-01-18 | 2 | -0/+48 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | Backport timetracking to CE See merge request !8195 | ||||
| | | * | | | | Backport backend work for time tracking. | Ruben Davila | 2017-01-15 | 2 | -0/+48 |
| | | | | | | | |||||
| | * | | | | | Merge branch '24915_merge_slash_command' into 'master' | Sean McGivern | 2017-01-17 | 1 | -0/+102 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support `/merge` slash command for MRs Closes #24915 See merge request !7746 | ||||
| | | * | | | | | Address MR comments | Jarka Kadlecova | 2017-01-13 | 1 | -0/+6 |
| | | | | | | | | |||||
| | | * | | | | | support `/merge` slash comand for MRs | Jarka Kadlecova | 2017-01-11 | 1 | -0/+96 |
| | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | Merge branch 'fix/keep-artifacts-button-visibility' into 'master' | Sean McGivern | 2017-01-17 | 1 | -0/+18 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show artifacts keep button if not allowed Closes #26357 See merge request !8501 | ||||
| | | * \ \ \ \ | Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility | Grzegorz Bizon | 2017-01-16 | 13 | -1513/+1720 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (579 commits) Conflicts: spec/models/build_spec.rb | ||||
| | | * | | | | | Add method that checks for expiring build artifacts | Grzegorz Bizon | 2017-01-09 | 1 | -13/+32 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'issue_25017' into 'master' | Sean McGivern | 2017-01-17 | 1 | -0/+26 |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'too many changes' message for merge request Closes #25017 See merge request !8444 | ||||
| | | * | | | | | Show 'too many changes' message for merge requestissue_25017 | Felipe Artur | 2017-01-12 | 1 | -0/+26 |
| | | | | | | | | |||||
| | * | | | | | | Expire related caches after changing HEADpmq20/gitlab-ce-psvr/head/cache | Minqi Pan | 2017-01-15 | 2 | -15/+22 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | Merge branch 'fix-build-sort-order' into 'master' | Robert Speicher | 2017-01-13 | 1 | -0/+19 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Sort order for pipeline build lists doesn't properly handle numbers" Closes #25428 See merge request !8277 | ||||
| | | * | | | | | revise sortable_name test formatting | Mike Greiling | 2017-01-13 | 1 | -4/+1 |
| | | | | | | | | |||||
| | | * | | | | | prefer unit test on model over view testfix-build-sort-order | Mike Greiling | 2017-01-02 | 1 | -0/+22 |
| | | | | | | | | |||||
| | * | | | | | | Fix Rubocop offense in build specsfix/merge-separate-build-spec-files | Grzegorz Bizon | 2017-01-13 | 1 | -1/+0 |
| | | | | | | | | |||||
