Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix_global_board_routes_39073' into 'master' | Douwe Maan | 2017-10-16 | 4 | -16/+20 |
|\ | |||||
| * | Fix feature specs for new scoped urls for boardsfix_global_board_routes_39073 | Valery Sizov | 2017-10-13 | 1 | -2/+2 |
| * | Add a changelog item | Valery Sizov | 2017-10-13 | 1 | -0/+5 |
| * | Remove boards from the list of reserved top paths | Valery Sizov | 2017-10-13 | 1 | -1/+0 |
| * | Move global boards routes under "-" scope | Valery Sizov | 2017-10-13 | 1 | -13/+13 |
* | | Merge branch 'sha-handling' into 'master' | Douwe Maan | 2017-10-16 | 9 | -28/+33 |
|\ \ | |||||
| * | | Adds requirements that supports anything in sha params | Guilherme Vieira | 2017-10-12 | 9 | -28/+33 |
* | | | Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ... | Douwe Maan | 2017-10-16 | 2 | -5/+12 |
|\ \ \ | |||||
| * | | | Make usage ping scheduling more robust39017-gitlabusagepingworker-is-not-running-on-gitlab-com | Sean McGivern | 2017-10-16 | 2 | -5/+12 |
* | | | | Merge branch 'zj-add-performance-changelog-cat' into 'master' | Robert Speicher | 2017-10-16 | 3 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | Add Performance category to the changelog | Zeger-Jan van de Weg | 2017-10-13 | 3 | -1/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'ide-update-monaco' into 'master' | Jacob Schatz | 2017-10-16 | 4 | -6/+7 |
|\ \ \ \ | |||||
| * | | | | Fixes the Problem with the Repo Editor Loading Typescript Serviceside-update-monaco | Tim Zallmann | 2017-10-12 | 2 | -2/+3 |
| * | | | | Upgraded Monaco | Tim Zallmann | 2017-10-05 | 2 | -4/+4 |
* | | | | | Merge branch 'rc-gitlab-qa-26-add-instance-mattermost-scenario' into 'master' | Grzegorz Bizon | 2017-10-16 | 10 | -21/+87 |
|\ \ \ \ \ | |||||
| * | | | | | Move tags out to containing feature | Richard Clamp | 2017-10-16 | 5 | -12/+12 |
| * | | | | | Cleanup a stray instance variable | Richard Clamp | 2017-10-16 | 1 | -1/+0 |
| * | | | | | Explicitly tag :core and :mattermost scenarios | Richard Clamp | 2017-10-16 | 6 | -15/+7 |
| * | | | | | Move rspec cli handling logic into Specs::Runner | Richard Clamp | 2017-10-16 | 2 | -4/+15 |
| * | | | | | Update comment | Richard Clamp | 2017-10-13 | 1 | -1/+1 |
| * | | | | | Simplify tag specification | Richard Clamp | 2017-10-13 | 4 | -13/+14 |
| * | | | | | Fixup company name | Richard Clamp | 2017-10-13 | 1 | -1/+1 |
| * | | | | | Add Test::Integration::Mattermost | Richard Clamp | 2017-10-13 | 6 | -15/+78 |
* | | | | | | Merge branch 'git-env-handle-arrays' into 'master' | Sean McGivern | 2017-10-16 | 3 | -6/+49 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add Gitlab::Git::Env.to_env_hash | Jacob Vosmaer | 2017-10-16 | 3 | -6/+49 |
* | | | | | | | Merge branch 'patch-19' into 'master' | Sean McGivern | 2017-10-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | update postgresql requirements | Ben Bodenmiller | 2017-10-14 | 1 | -2/+2 |
* | | | | | | | | Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int... | Grzegorz Bizon | 2017-10-16 | 5 | -6/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retried | Sean McGivern | 2017-10-16 | 5 | -6/+37 |
* | | | | | | | | | Merge branch 'winh-indeterminate-dropdown' into 'master' | Phil Hughes | 2017-10-16 | 2 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix alignment for indeterminate marker in dropdownswinh-indeterminate-dropdown | Winnie Hellmann | 2017-10-11 | 2 | -0/+6 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'conflict-resolution-refactor' into 'master' | Sean McGivern | 2017-10-16 | 28 | -345/+420 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactor | Alejandro Rodríguez | 2017-10-12 | 12 | -43/+25 |
| * | | | | | | | | | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 24 | -323/+334 |
| * | | | | | | | | | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 18 | -300/+388 |
| * | | | | | | | | | Clean hierarchy of calls between models and Gitalb::Git for blob search | Alejandro Rodríguez | 2017-10-12 | 2 | -3/+5 |
| * | | | | | | | | | Move Gitlab::Diff::LineCode to module Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 10 | -20/+20 |
| * | | | | | | | | | Encapsulate git operations for conflict resolution into lib | Alejandro Rodríguez | 2017-10-12 | 3 | -60/+52 |
* | | | | | | | | | | Merge branch 'fix_diff_parsing' into 'master' | Sean McGivern | 2017-10-16 | 3 | -1/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add a changelog itemfix_diff_parsing | Valery Sizov | 2017-10-15 | 1 | -0/+5 |
| * | | | | | | | | | | Fix diff parser so it tolerates to diff special markers in the content | Valery Sizov | 2017-10-15 | 2 | -1/+20 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'gitaly-call-kwargs' into 'master' | Sean McGivern | 2017-10-16 | 1 | -4/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix confusing double usage of 'metadata' | Jacob Vosmaer (GitLab) | 2017-10-16 | 1 | -4/+16 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'an/popen-deadline' into 'master' | Sean McGivern | 2017-10-16 | 5 | -1/+208 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Popen with a timeout | Andrew Newdigate | 2017-10-16 | 5 | -1/+208 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'implements-closing-docs' into 'master' | Sean McGivern | 2017-10-16 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update automatic_issue_closing.mdimplements-closing-docs | Victor Wu | 2017-10-13 | 1 | -1/+2 |
* | | | | | | | | | | | Merge branch 'backport-milestone-select-change' into 'master' | Filipa Lacerda | 2017-10-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Backport a change in milestone_select from EEbackport-milestone-select-change | Phil Hughes | 2017-10-13 | 1 | -0/+2 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl... | Kamil Trzciński | 2017-10-16 | 4 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ \ |