Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-qa-default-timeout' into 'master' | Grzegorz Bizon | 2017-11-15 | 1 | -1/+1 |
|\ | |||||
| * | Raise the QA Capybara's default wait time from 4 to 10rs-qa-default-timeout | Robert Speicher | 2017-11-14 | 1 | -1/+1 |
* | | Merge branch 'update-merge-worker-metrics' into 'master' | Sean McGivern | 2017-11-15 | 3 | -1/+34 |
|\ \ | |||||
| * | | [ci-skip] lintingupdate-merge-worker-metrics | Micael Bergeron | 2017-11-14 | 1 | -1/+0 |
| * | | rework the logging to be simpler and add a threshold | micael.bergeron | 2017-11-14 | 2 | -9/+21 |
| * | | [ci-skip] add changelog | GitLab Development | 2017-11-13 | 1 | -0/+5 |
| * | | add simple logging to UpdateMergeRequestsWorker#perform | micael.bergeron | 2017-11-13 | 2 | -1/+18 |
* | | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ... | Phil Hughes | 2017-11-15 | 2 | -10/+11 |
|\ \ \ | |||||
| * | | | Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widget | Eric Eastwood | 2017-11-13 | 2 | -10/+11 |
* | | | | Merge branch '33338-internationalization-support-for-prometheus-service-confi... | Phil Hughes | 2017-11-15 | 3 | -18/+20 |
|\ \ \ \ | |||||
| * | | | | Resolve "Internationalization support for Prometheus Service Configuration" | Jose Ivan Vargas Lopez | 2017-11-15 | 3 | -18/+20 |
|/ / / / | |||||
* | | | | Merge branch 'patch-2' into 'master' | Achilleas Pipinellis | 2017-11-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Replace 'charts' with 'chart' | Nestor Pestelos | 2017-11-15 | 1 | -1/+1 |
* | | | | | Merge branch '38007-update-licensing-docs' into 'master' | Achilleas Pipinellis | 2017-11-15 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | update licensing docs to mention that we check node_modules for license infor...38007-update-licensing-docs | Mike Greiling | 2017-09-29 | 1 | -3/+3 |
* | | | | | | Merge branch '40161-extra-margin-on-svg-logo-in-header' into 'master' | Annabel Dunstone Gray | 2017-11-15 | 2 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 40161 Remove extra margin from wordmark in header40161-extra-margin-on-svg-logo-in-header | tauriedavis | 2017-11-14 | 2 | -1/+6 |
* | | | | | | | Merge branch 'gitaly-fix-broken-specs' into 'master' | Robert Speicher | 2017-11-14 | 1 | -2/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | we need to disable gitaly for some tests | Kim "BKC" Carlbäcker | 2017-11-14 | 1 | -2/+6 |
* | | | | | | | Update CHANGELOG.md for 10.1.4 | Felipe Artur | 2017-11-14 | 5 | -21/+10 |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Felipe Artur | 2017-11-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch dev/master into master | Felipe Artur | 2017-11-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Prevent error when authorizing an admin-created OAauth application without a ... | Douwe Maan | 2017-11-13 | 2 | -5/+14 |
| * | | | | | | Move update_project_counter_caches? out of issue and merge request | George Andrinopoulos | 2017-11-13 | 7 | -39/+14 |
| * | | | | | | Add externalized strings | George Andrinopoulos | 2017-11-13 | 2 | -4/+4 |
| * | | | | | | Add feature test to milestone | George Andrinopoulos | 2017-11-13 | 2 | -0/+35 |
| * | | | | | | Move total time spend calculation to milestoneish | George Andrinopoulos | 2017-11-13 | 7 | -77/+24 |
| * | | | | | | Fix static code analysis offence | George Andrinopoulos | 2017-11-13 | 1 | -1/+1 |
| * | | | | | | Fix collapsed sidebar messages and icon | George Andrinopoulos | 2017-11-13 | 5 | -6/+18 |
| * | | | | | | Add total time spent to milestones | George Andrinopoulos | 2017-11-13 | 5 | -0/+82 |
* | | | | | | | Merge branch 'bvl-subgroup-in-dropdowns' into 'master' | Sean McGivern | 2017-11-14 | 8 | -11/+161 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdowns | Bob Van Landuyt | 2017-11-14 | 1 | -2/+5 |
| * | | | | | | | Include child projects a user can manage in namespace dropdowns | Bob Van Landuyt | 2017-11-14 | 8 | -10/+157 |
* | | | | | | | | Merge branch 'update-metrics-for-k8s-1.7' into 'master' | Tim Zallmann | 2017-11-14 | 2 | -8/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Uodate docsupdate-metrics-for-k8s-1.7 | Joshua Lambert | 2017-11-12 | 1 | -2/+2 |
| * | | | | | | | | Change label to be more consistent, not a series. | Joshua Lambert | 2017-11-12 | 1 | -4/+2 |
| * | | | | | | | | Fix CPU metric | Joshua Lambert | 2017-11-12 | 1 | -2/+2 |
| * | | | | | | | | Fix to use variable | Joshua Lambert | 2017-11-12 | 1 | -1/+1 |
| * | | | | | | | | Adjust metrics to ignore Job tag to support k8s 1.7+ | Joshua Lambert | 2017-11-12 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'fix-typo' into 'master' | Annabel Dunstone Gray | 2017-11-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Fix typofix-typo | Clement Ho | 2017-11-13 | 1 | -1/+1 |
* | | | | | | | | | Merge branch '32098-pipelines-navigation' into 'master'38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings | Phil Hughes | 2017-11-14 | 12 | -252/+385 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Stops page reload when changing tabs or pages - uses API requests instead | Filipa Lacerda | 2017-11-14 | 12 | -252/+385 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master' | Clement Ho | 2017-11-14 | 6 | -10/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Enable UnnecessaryMantissa in scss-lint | Takuya Noguchi | 2017-11-09 | 6 | -10/+15 |
* | | | | | | | | | | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master' | Yorick Peterse | 2017-11-14 | 3 | -2/+24 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-source | Bob Van Landuyt | 2017-11-14 | 3 | -2/+24 |
* | | | | | | | | | | Merge branch 'issue_40058' into 'master' | Sean McGivern | 2017-11-14 | 3 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Prevents position update for image diff notesissue_40058 | Felipe Artur | 2017-11-13 | 3 | -1/+13 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-filter-by-my-reaction' into 'master' | Sean McGivern | 2017-11-14 | 3 | -1/+60 |
|\ \ \ \ \ \ \ \ \ \ |