Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable RSpec/FilePath copenable-spec-file-name-cop | Sean McGivern | 2017-04-26 | 35 | -587/+342 |
* | Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' | Sean McGivern | 2017-04-25 | 4 | -4/+18 |
|\ | |||||
| * | Don't display the `is_admin?` flag for user API responses. | Timothy Andrew | 2017-04-25 | 4 | -4/+18 |
* | | Merge branch 'gitaly-testing-toml' into 'master' | Rémy Coutable | 2017-04-25 | 1 | -3/+4 |
|\ \ | |||||
| * | | Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml | Alejandro Rodríguez | 2017-04-18 | 1 | -3/+4 |
* | | | Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master' | Jacob Schatz | 2017-04-24 | 1 | -15/+16 |
|\ \ \ | |||||
| * | | | Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestion | Eric Eastwood | 2017-04-22 | 1 | -15/+16 |
* | | | | Merge branch 'add-aria-to-icon' into 'master' | Jacob Schatz | 2017-04-24 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | Improve specsadd-aria-to-icon | Clement Ho | 2017-04-24 | 1 | -1/+3 |
| * | | | | Add tests | Clement Ho | 2017-04-18 | 1 | -0/+13 |
* | | | | | Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' | Sean McGivern | 2017-04-24 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Ensure replying to an individual note by email creates a note with its own di...dm-fix-individual-notes-reply-attributes | Douwe Maan | 2017-04-24 | 1 | -0/+8 |
* | | | | | | Merge branch 'notebooklab-in-repo' into 'master' | Jacob Schatz | 2017-04-24 | 8 | -1/+417 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo | Phil Hughes | 2017-04-13 | 10 | -97/+223 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into notebooklab-in-repo | Phil Hughes | 2017-04-13 | 29 | -328/+1048 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Pull in fixture files from the repo | Phil Hughes | 2017-04-11 | 6 | -7/+49 |
| * | | | | | | | | Moved NotebookLab assets into repo | Phil Hughes | 2017-04-11 | 6 | -0/+374 |
* | | | | | | | | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' | Sean McGivern | 2017-04-24 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-url | Stan Hu | 2017-04-24 | 1 | -0/+15 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' | Sean McGivern | 2017-04-24 | 1 | -7/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix commenting on an existing discussion on an unchanged line that is no long... | Douwe Maan | 2017-04-24 | 1 | -7/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch '30305-oauth-token-push-code' into 'master' | Rémy Coutable | 2017-04-24 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Allow OAuth clients to push code30305-oauth-token-push-code | Timothy Andrew | 2017-04-13 | 2 | -3/+3 |
* | | | | | | | | | | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax' | Rémy Coutable | 2017-04-24 | 168 | -362/+87 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Unnecessary "include WaitForAjax" and "include ApiHelpers" | Jacopo | 2017-04-21 | 169 | -364/+87 |
* | | | | | | | | | | | Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master' | Sean McGivern | 2017-04-24 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-path | Stan Hu | 2017-04-24 | 1 | -0/+18 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' | Kamil Trzciński | 2017-04-24 | 3 | -31/+66 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Simplify specs and remove unnecessary attributestc-realtime-every-pipeline-on-mr | Toon Claes | 2017-04-24 | 2 | -13/+4 |
| * | | | | | | | | | | | Refactor ExpirePipelineCacheWorker#perform | Toon Claes | 2017-04-24 | 2 | -8/+16 |
| * | | | | | | | | | | | Use a better performing query to find all MRs for pipeline | Toon Claes | 2017-04-24 | 2 | -1/+37 |
| * | | | | | | | | | | | Properly expire cache for **all** MRs of a pipeline | Toon Claes | 2017-04-24 | 2 | -7/+7 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' | Kamil Trzciński | 2017-04-24 | 1 | -20/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Improve helpers in pipeline model specs | Grzegorz Bizon | 2017-04-21 | 1 | -3/+3 |
| * | | | | | | | | | | | Fix missing pipeline duration for blocked pipelines | Grzegorz Bizon | 2017-04-21 | 1 | -19/+44 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' | Kamil Trzciński | 2017-04-24 | 3 | -18/+85 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add specs for new ci status helper method | Grzegorz Bizon | 2017-04-21 | 1 | -9/+38 |
| * | | | | | | | | | | | Fix lastest commit status text on main project page | Grzegorz Bizon | 2017-04-21 | 2 | -9/+47 |
* | | | | | | | | | | | | Merge branch 'rs-empty-project-features' into 'master' | Rémy Coutable | 2017-04-24 | 18 | -44/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Use `:empty_project` where possible in top-level feature specsrs-empty-project-features | Robert Speicher | 2017-04-20 | 18 | -44/+56 |
* | | | | | | | | | | | | | Merge branch 'dz-fix-spec-filenames-ce' into 'master' | Sean McGivern | 2017-04-24 | 5 | -51/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix outdated specs that were not executed due to wrong filename | Dmitriy Zaporozhets | 2017-04-24 | 2 | -4/+6 |
| * | | | | | | | | | | | | | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ce | Dmitriy Zaporozhets | 2017-04-24 | 5 | -47/+40 |
* | | | | | | | | | | | | | | Merge branch '29335-fix-request-access-button-visibility' into 'master' | Douwe Maan | 2017-04-24 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Added test to prevent ‘Request access’ regression29335-fix-request-access-button-visibility | James Edwards-Jones | 2017-04-22 | 1 | -0/+11 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'mrchrisw-22740-merge-api' into 'master' | Sean McGivern | 2017-04-24 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-api | Chris Wilson | 2017-04-24 | 1 | -1/+13 |
* | | | | | | | | | | | | | | | Merge branch 'rs-rename-login_as' into 'master' | Rémy Coutable | 2017-04-24 | 2 | -5/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Return early from `finished_all_ajax_requests?` when jQuery is undefinedrs-rename-login_as | Robert Speicher | 2017-04-19 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Simplify the `javascript_test?` helper | Robert Speicher | 2017-04-19 | 1 | -1/+3 |