Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't define ApplicationSetting defaults in a constantbackport-fix-load-error | Rémy Coutable | 2017-01-20 | 1 | -3/+3 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'fix/import-users' into 'master' | Rémy Coutable | 2017-01-20 | 2 | -14/+6 |
|\ | | | | | | | | | | | | | Fix import no longer mapping users as admin Closes #25346 See merge request !8625 | ||||
| * | fix member mapper specfix/import-users | James Lopez | 2017-01-20 | 1 | -2/+0 |
| | | |||||
| * | fix typo | James Lopez | 2017-01-19 | 1 | -1/+1 |
| | | |||||
| * | fix and refactor note user mapping | James Lopez | 2017-01-18 | 2 | -9/+3 |
| | | |||||
| * | added spec replicating the problem | James Lopez | 2017-01-18 | 1 | -1/+1 |
| | | |||||
| * | do not map usersat all unless admin | James Lopez | 2017-01-18 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' | Robert Speicher | 2017-01-20 | 2 | -32/+16 |
|\ \ | | | | | | | | | | | | | Don't persist application settings in test env See merge request !8573 | ||||
| * | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env | Rémy Coutable | 2017-01-15 | 2 | -4/+16 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Move default values to ApplicationSetting::DEFAULTS and use it in ↵ | Rémy Coutable | 2017-01-15 | 1 | -29/+1 |
| | | | | | | | | | | | | | | | | | | CurrentSettings Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Fix specs | Kamil Trzcinski | 2017-01-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 8 | -1/+133 |
|\ \ \ | |||||
| * \ \ | Merge branch 'feature/gitaly-feature-flag' into 'master' | Robert Speicher | 2017-01-19 | 1 | -1/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Gitaly feature flag See merge request !8440 | ||||
| | * | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flag | Ahmad Sherif | 2017-01-18 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 4 | -0/+88 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480 | ||||
| | * | | | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 2 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | Improve presenter factory | Rémy Coutable | 2017-01-18 | 2 | -39/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | Improve presenter architecture | Rémy Coutable | 2017-01-18 | 4 | -32/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | Document presenters | Rémy Coutable | 2017-01-18 | 2 | -0/+71 |
| | | |_|/ | | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Merge branch 'fix/external-status-badge-links' into 'master' | Kamil Trzciński | 2017-01-19 | 3 | -0/+37 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link external commit status badges to target URLs Closes #25662 See merge request !8611 | ||||
| | * | | | | Respond with validation errors in commit status APIfix/external-status-badge-links | Grzegorz Bizon | 2017-01-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If validation errors are present, include validation errors in the commit status API payload, instead of depending on state machine errors caused by invalid record. | ||||
| | * | | | | Link external commit status badge to a target URL | Grzegorz Bizon | 2017-01-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Using new detailed statuses factory for external commit statuses. | ||||
| | * | | | | Add detailed statuses for external commit statuses | Grzegorz Bizon | 2017-01-17 | 2 | -0/+35 |
| | | | | | | |||||
* | | | | | | Fix specs | Kamil Trzcinski | 2017-01-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 187 | -1122/+6359 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' | Douwe Maan | 2017-01-18 | 31 | -210/+439 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cycle analytics stages (1st iteration) See merge request !7647 | ||||
| | * | | | | | fix specfix/refactor-cycle-analytics-stages | James Lopez | 2017-01-17 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | refactored a bunch of stuff based on feedback | James Lopez | 2017-01-17 | 10 | -43/+49 |
| | | | | | | | |||||
| | * | | | | | fix bug retrieving medians | James Lopez | 2017-01-17 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix specs | James Lopez | 2017-01-17 | 2 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | refactored metrics fetcher - merged into stage and events | James Lopez | 2017-01-17 | 15 | -119/+116 |
| | | | | | | | |||||
| | * | | | | | fix refactor of production event fetcher | James Lopez | 2017-01-17 | 2 | -17/+17 |
| | | | | | | | |||||
| | * | | | | | a few more fixes | James Lopez | 2017-01-17 | 2 | -18/+1 |
| | | | | | | | |||||
| | * | | | | | fix missing refactor in metrics fetcher | James Lopez | 2017-01-17 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | fix plan stage issue and some spec failures | James Lopez | 2017-01-17 | 3 | -3/+9 |
| | | | | | | | |||||
| | * | | | | | fix specs, refactor missing bits from events stuff | James Lopez | 2017-01-17 | 4 | -11/+12 |
| | | | | | | | |||||
| | * | | | | | big refactor based on MR feedback | James Lopez | 2017-01-17 | 21 | -117/+123 |
| | | | | | | | |||||
| | * | | | | | few fixes after merge | James Lopez | 2017-01-17 | 2 | -3/+10 |
| | | | | | | | |||||
| | * | | | | | refactor fetcher and fixed specs | James Lopez | 2017-01-17 | 4 | -34/+22 |
| | | | | | | | |||||
| | * | | | | | refactor cycle analytics - updated based on MR feedback | James Lopez | 2017-01-17 | 13 | -61/+89 |
| | | | | | | | |||||
| | * | | | | | Fix other spec failures | James Lopez | 2017-01-17 | 5 | -44/+5 |
| | | | | | | | |||||
| | * | | | | | more refactoring and fixing old specs | James Lopez | 2017-01-17 | 1 | -15/+3 |
| | | | | | | | |||||
| | * | | | | | added new summary serializers and refactor all of the summary stuff into ↵ | James Lopez | 2017-01-17 | 5 | -0/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | separate logical classes | ||||
| | * | | | | | fixed stage entity and added missing stage specs | James Lopez | 2017-01-17 | 1 | -1/+5 |
| | | | | | | | |||||
| | * | | | | | added analytics stage serializer and moved some info to the stage classes ↵ | James Lopez | 2017-01-17 | 8 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the controller | ||||
| | * | | | | | WIP - started refactoring cycle analytics median stuff into stages | James Lopez | 2017-01-17 | 18 | -19/+111 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'time-tracking-api' into 'master' | Sean McGivern | 2017-01-18 | 6 | -11/+144 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time tracking API Closes #25861 See merge request !8483 | ||||
| | * | | | | | Add some API endpoints for time tracking. | Ruben Davila | 2017-01-18 | 6 | -11/+144 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'rs-data_attribute-cleanup' into 'master' | Douwe Maan | 2017-01-18 | 1 | -3/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct documentation for `data_attribute` method See merge request !8603 | ||||
| | * | | | | | | Correct documentation for `data_attribute` methodrs-data_attribute-cleanup | Robert Speicher | 2017-01-16 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also break up a long line, just 'cause. |