Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '38178-fl-mr-notes-components' into 'master' | Phil Hughes | 2017-10-25 | 4 | -27/+32 |
|\ | |||||
| * | Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-components | Filipa Lacerda | 2017-10-19 | 4 | -27/+32 |
* | | Merge branch 'gitaly-ff-merge-preparation' into 'master' | Rémy Coutable | 2017-10-25 | 1 | -0/+54 |
|\ \ | |||||
| * | | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparation | Alejandro Rodríguez | 2017-10-24 | 1 | -0/+54 |
| |/ | |||||
* | | Merge branch '35199-case-insensitive-branches-search' into 'master' | Sean McGivern | 2017-10-25 | 1 | -0/+9 |
|\ \ | |||||
| * | | Add case insensitive branches search | George Andrinopoulos | 2017-10-23 | 1 | -0/+9 |
* | | | Merge branch 'gitaly-gl-username' into 'master' | Douwe Maan | 2017-10-24 | 3 | -17/+21 |
|\ \ \ | |||||
| * | | | Support `Gitaly::User`'s gl_username fieldgitaly-gl-username | Alejandro Rodríguez | 2017-10-23 | 3 | -17/+21 |
* | | | | Merge branch 'sh-memoize-logger' into 'master' | Nick Thomas | 2017-10-24 | 1 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | Memoize GitLab logger to reduce open file descriptors | Stan Hu | 2017-10-24 | 1 | -0/+12 |
| |/ / / | |||||
* | | | | Merge branch 'sh-fix-environment-write-ref' into 'master' | Grzegorz Bizon | 2017-10-24 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | Fix the writing of invalid environment refssh-fix-environment-write-ref | Stan Hu | 2017-10-23 | 1 | -0/+10 |
* | | | | | Merge branch '23000-pages-api' into 'master' | Grzegorz Bizon | 2017-10-24 | 2 | -0/+463 |
|\ \ \ \ \ | |||||
| * | | | | | Add pages domains API tests | Travis Miller | 2017-10-22 | 1 | -0/+440 |
| * | | | | | Add pages domains API schema | Travis Miller | 2017-10-22 | 1 | -0/+23 |
* | | | | | | Merge branch 'bvl-circuitbreaker-backoff' into 'master' | Sean McGivern | 2017-10-24 | 4 | -169/+133 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoff | Bob Van Landuyt | 2017-10-23 | 1 | -2/+13 |
| * | | | | | | Perform the stat check multiple times when checking a storage | Bob Van Landuyt | 2017-10-23 | 2 | -1/+27 |
| * | | | | | | Implement backoff for the circuitbreaker | Bob Van Landuyt | 2017-10-23 | 2 | -178/+94 |
| * | | | | | | Allow configuring new circuitbreaker settings from the UI and API | Bob Van Landuyt | 2017-10-23 | 1 | -1/+12 |
* | | | | | | | Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master' | Filipa Lacerda | 2017-10-24 | 7 | -20/+363 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdown | Phil Hughes | 2017-10-23 | 4 | -0/+263 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | spec fixes | Phil Hughes | 2017-10-23 | 3 | -138/+145 |
| * | | | | | | | added feature spec | Phil Hughes | 2017-10-23 | 3 | -0/+99 |
| * | | | | | | | fixed failing title test | Phil Hughes | 2017-10-23 | 1 | -0/+1 |
| * | | | | | | | fixed bug with tabs not switching correctly | Phil Hughes | 2017-10-23 | 1 | -1/+1 |
| * | | | | | | | failing spec fixes | Phil Hughes | 2017-10-23 | 1 | -17/+11 |
| * | | | | | | | correctly creates file in currently viewed directory | Phil Hughes | 2017-10-23 | 3 | -3/+245 |
* | | | | | | | | Merge branch '37860-pipelines-page' into 'master' | Phil Hughes | 2017-10-23 | 5 | -9/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Changes after review37860-pipelines-page | Filipa Lacerda | 2017-10-23 | 2 | -0/+4 |
| * | | | | | | | | Merge branch 'master' into 37860-pipelines-page | Filipa Lacerda | 2017-10-23 | 34 | -189/+340 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Fix failing tests | Filipa Lacerda | 2017-10-19 | 2 | -2/+0 |
| * | | | | | | | | Make pipelines table in MR view usable | Filipa Lacerda | 2017-10-18 | 1 | -7/+16 |
* | | | | | | | | | Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' i... | Rémy Coutable | 2017-10-23 | 178 | -2658/+2658 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Refactor `have_http_status` into `have_gitlab_http_status` in the specs | Jacopo | 2017-10-20 | 178 | -2658/+2658 |
* | | | | | | | | | | Merge branch 'backort_routes_group_routes_from_ee' into 'master' | Douwe Maan | 2017-10-23 | 1 | -9/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Backport EE changes to group routesbackort_routes_group_routes_from_ee | Valery Sizov | 2017-10-22 | 1 | -9/+3 |
* | | | | | | | | | | | Merge branch 'bvl-fix-push-event-service-for-forks' into 'master' | Douwe Maan | 2017-10-23 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forks | Bob Van Landuyt | 2017-10-22 | 1 | -1/+0 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-escaped-text-replacement' into 'master' | Filipa Lacerda | 2017-10-23 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | notes.js: use the original content when resetting the form | Ben Boeckel | 2017-10-19 | 1 | -0/+10 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Create new branch from dropdown. | Jacob Schatz | 2017-10-23 | 3 | -0/+253 |
| |_|_|_|/ / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'add-shared-vue-loading-button' into 'master' | Filipa Lacerda | 2017-10-23 | 1 | -0/+93 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add loading buttonadd-shared-vue-loading-button | Eric Eastwood | 2017-10-23 | 1 | -0/+93 |
* | | | | | | | | | Merge branch '38869-diff' into 'master' | Phil Hughes | 2017-10-23 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove Diff class from globalnamespace | Filipa Lacerda | 2017-10-19 | 1 | -3/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bvl-fix-group-atom-feed' into 'master' | Douwe Maan | 2017-10-22 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Make sure we render events for projects within a group | Bob Van Landuyt | 2017-10-20 | 1 | -0/+25 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Fix the external URLs generated for online view of HTML artifacts | Nick Thomas | 2017-10-20 | 1 | -4/+3 |
* | | | | | | | Merge branch 'multi-file-editor-submodules' into 'master' | Filipa Lacerda | 2017-10-20 | 3 | -2/+44 |
|\ \ \ \ \ \ \ |