Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'sh-bump-sidekiq-5.2.1' into 'master' | Robert Speicher | 2018-09-10 | 3 | -13/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Explicitly enable usage ping for instance statistics spec | Stan Hu | 2018-09-09 | 1 | -0/+2 | |
| * | | | | | | | | | | | Bump Sidekiq 5.1.3 to 5.2.1 | Stan Hu | 2018-09-09 | 3 | -13/+11 | |
* | | | | | | | | | | | | Merge branch 'sh-bump-gitlab-shell-8.3.1' into 'master' | Bob Van Landuyt | 2018-09-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Bump gitlab-shell to 8.3.1 | Stan Hu | 2018-09-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2018-09-10 | 1 | -13/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Correct YAML indentation | Cam | 2018-09-10 | 1 | -13/+13 | |
* | | | | | | | | | | | | | Merge branch 'update-jobs-api-docs' into 'master' | Rémy Coutable | 2018-09-10 | 1 | -13/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add `duration` attributes to Jobs API docs | Mehdi Lahmam | 2018-09-09 | 1 | -13/+23 | |
* | | | | | | | | | | | | | | Merge branch '21371-changelog' into 'master' | Rémy Coutable | 2018-09-10 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add changelog to !21371 | Vicary Archangel | 2018-09-08 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | Merge branch 'lock-unlock-quick-actions' into 'master' | Rémy Coutable | 2018-09-10 | 8 | -5/+162 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Prefer `sign_in` over `gitlab_sign_in` as its faster | Mehdi Lahmam | 2018-09-06 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | Use un-namespaced project issuables path helper in specs | Mehdi Lahmam | 2018-09-06 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | | Rename `slash_commands` ~> `quick_actions` in specs files | Mehdi Lahmam | 2018-09-06 | 4 | -0/+0 | |
| * | | | | | | | | | | | | | | Add /lock and /unlock quick actions | Mehdi Lahmam | 2018-09-06 | 5 | -0/+157 | |
* | | | | | | | | | | | | | | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-09-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Replace one word in todos.md | Kenny Evitt | 2018-06-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'doc-update-dashboard-url' into 'master' | Nick Thomas | 2018-09-10 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Update url reference for grafana | Mark Chao | 2018-09-10 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'improve-chart-index-docs' into 'master' | Achilleas Pipinellis | 2018-09-10 | 1 | -17/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Clean up chart index page | Joshua Lambert | 2018-09-10 | 1 | -17/+6 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'docs/make-caching-docs-adhere-to-styleguide' into 'master' | Marcia Ramos | 2018-09-10 | 1 | -34/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Make topic adhere to style guide. | Evan Read | 2018-09-07 | 1 | -34/+35 | |
* | | | | | | | | | | | | | | | | | Merge branch 'backup-restore-tar-version' into 'master' | Achilleas Pipinellis | 2018-09-10 | 1 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Specify tar is required for backup and restore tasks | Balasankar "Balu" C | 2018-09-10 | 1 | -3/+13 | |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'docs/51295-update-documentation-for-interactive-web-terminals-t... | Achilleas Pipinellis | 2018-09-10 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Remove beta from web terminal51295-update-documentation-for-interactive-web-terminals-to-remove-beta-indicator | Steve Azzopardi | 2018-09-10 | 1 | -5/+1 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch '50036-document-permissions' into 'master' | Achilleas Pipinellis | 2018-09-10 | 2 | -0/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Document permissions for different entities | Jarka Košanová | 2018-09-10 | 2 | -0/+64 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'qa-fix-specs-runner-when-args-given' into 'master' | Rémy Coutable | 2018-09-10 | 2 | -21/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | [QA] Fix arguments passed to RSpec::Core::Runner | Rémy Coutable | 2018-09-07 | 2 | -21/+46 | |
* | | | | | | | | | | | | | | | | | Merge branch 'frozen-string-enable-app-helpers' into 'master' | Rémy Coutable | 2018-09-10 | 102 | -130/+321 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Enable frozen string for app/helpers/**/*.rb | gfyoung | 2018-09-06 | 102 | -130/+321 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-ldap-qa' into 'master' | Rémy Coutable | 2018-09-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fix LDAP QA specs failing due to button change | Stan Hu | 2018-09-08 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'dks-update-templates-licenses-11-3' into 'master' | Bob Van Landuyt | 2018-09-10 | 19 | -563/+93 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Update templates and licenses for 11.3dks-update-templates-licenses-11-3 | Diana Stanley | 2018-09-10 | 19 | -563/+93 | |
* | | | | | | | | | | | | | | | | | | Merge branch '51281-on-master-diff-view-contains-extra-and-signs' into 'master' | Phil Hughes | 2018-09-10 | 3 | -4/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Resolve "On master, inline diff view contains extra `+` and `-` signs" | Tim Zallmann | 2018-09-10 | 3 | -4/+19 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'sidekiq-query' into 'master' | Rémy Coutable | 2018-09-10 | 1 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Disable query limit counter in sidekiq | Jan Provaznik | 2018-09-04 | 1 | -0/+20 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'api-promote-find-branch' into 'master' | Rémy Coutable | 2018-09-10 | 4 | -11/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Fix rubocop | Robert Schilling | 2018-09-08 | 1 | -5/+3 | |
| * | | | | | | | | | | | | | | | | | | API: Use find_branch! in all places | Robert Schilling | 2018-09-08 | 4 | -11/+15 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-failing-instances-statistics-spec' into 'master' | Rémy Coutable | 2018-09-10 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Explicitly enable usage ping for instance statistics spec | Stan Hu | 2018-09-09 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-new-project-qa' into 'master' | Grzegorz Bizon | 2018-09-10 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Fix QA builds failing due to change in new project page behavior | Stan Hu | 2018-09-08 | 1 | -1/+2 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch '38208-due-dates-system-notes' into 'master' | Stan Hu | 2018-09-09 | 6 | -2/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |