Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'dm-remove-favicon-main-version' into 'master' | Robert Speicher | 2018-06-15 | 7 | -63/+6 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Remove FaviconUploader favicon_main versiondm-remove-favicon-main-version | Douwe Maan | 2018-06-15 | 7 | -63/+6 | |
* | | | | | | | | Merge branch '44771-prettier-seems-to-ignore-the-overrides-2' into 'master' | Filipa Lacerda | 2018-06-15 | 4 | -38/+49 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed the searching on the whole disk :-P44771-prettier-seems-to-ignore-the-overrides-2 | Tim Zallmann | 2018-06-15 | 1 | -3/+6 | |
| * | | | | | | | | Added possibility to run prettier against one specific directory to make our ... | Tim Zallmann | 2018-06-15 | 2 | -3/+23 | |
| * | | | | | | | | Fixed Prettier Config Applying + Updated Prettier to newest version | Tim Zallmann | 2018-06-15 | 3 | -36/+24 | |
* | | | | | | | | | Merge branch 'enable-no-restricted-globals' into 'master' | Phil Hughes | 2018-06-15 | 42 | -53/+55 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Enable no-restricted-globals in JS files | gfyoung | 2018-06-15 | 42 | -53/+55 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'ce-6145-extract-app-views-shared-issuable-3' into 'master' | Robert Speicher | 2018-06-15 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Unify app/views/shared/issuable/form/_metadata.html.hamlce-6145-extract-app-views-shared-issuable-3 | Lin Jen-Shin | 2018-06-14 | 1 | -1/+4 | |
| * | | | | | | | | | Unify app/views/shared/issuable/_sidebar_assignees.html.haml | Lin Jen-Shin | 2018-06-14 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch '47915-badges' into 'master' | Clement Ho | 2018-06-15 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix specs | Clement Ho | 2018-06-15 | 1 | -2/+2 | |
| * | | | | | | | | | | Truncate long label names47915-badges | Annabel Dunstone Gray | 2018-06-14 | 2 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-optimistic-lock-values' into 'master' | Yorick Peterse | 2018-06-15 | 2 | -52/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [Rails5] Fix optimistic lock value | blackst0ne | 2018-06-15 | 2 | -52/+64 | |
* | | | | | | | | | | | | Merge branch 'fix-flakey-move-slash-command-unauthorized-project' into 'master' | Robert Speicher | 2018-06-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix flakey move slash command with unauthorized projectfix-flakey-move-slash-command-unauthorized-project | Eric Eastwood | 2018-06-14 | 1 | -1/+3 | |
* | | | | | | | | | | | | | Merge branch 'fix_google_oauth_docs' into 'master' | Achilleas Pipinellis | 2018-06-15 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Update google.md to reflect need for Google+ API for oauth integration; | Tom Downes | 2018-05-02 | 1 | -1/+6 | |
* | | | | | | | | | | | | | Merge branch 'rails5-fix-47836' into 'master' | Yorick Peterse | 2018-06-15 | 3 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Rails5 fix passing Group objects array into for_projects_and_groups milestone... | Jasper Maes | 2018-06-14 | 3 | -3/+9 | |
* | | | | | | | | | | | | | | Merge branch 'bvl-graphql-nested-merge-request' into 'master' | Douwe Maan | 2018-06-15 | 12 | -108/+107 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Allow querying a single MR within a project | Bob Van Landuyt | 2018-06-15 | 12 | -108/+107 | |
| * | | | | | | | | | | | | | | Correct the type of the `MergeRequestResolver`. | Bob Van Landuyt | 2018-06-14 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'adding-package-lock-ignore' into 'master' | Phil Hughes | 2018-06-15 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Update .gitignore with ignoring package-lock.json | Dimitrie Hoekstra | 2018-06-15 | 1 | -0/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'fix-rails5-nagative-enum-spec' into 'master' | Kamil Trzciński | 2018-06-15 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Remove unexpected data store test suitefix-rails5-nagative-enum-spec | Shinya Maeda | 2018-06-15 | 1 | -8/+0 | |
| * | | | | | | | | | | | | | | Fix "[Rails5] '-1' is not a valid data_store" | Shinya Maeda | 2018-06-15 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'ide-add-last-commit-id-to-api-call' into 'master' | Douwe Maan | 2018-06-15 | 6 | -117/+107 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | only return last_commit_sha in the JSONide-add-last-commit-id-to-api-call | Phil Hughes | 2018-06-15 | 5 | -13/+8 | |
| * | | | | | | | | | | | | | | IDE sends last commit ID when committing changes | Phil Hughes | 2018-06-15 | 6 | -117/+112 | |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'fl-reduce-tech-debt' into 'master' | Phil Hughes | 2018-06-15 | 1 | -15/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Removes unused imports and prettifies codefl-reduce-tech-debt | Filipa Lacerda | 2018-06-15 | 1 | -15/+20 | |
* | | | | | | | | | | | | | | Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master' | Kamil Trzciński | 2018-06-15 | 2 | -0/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Backport InternalRedirect#sanitize_redirectce-jej/sanitize-group-saml-relay-state | James Edwards-Jones | 2018-06-14 | 2 | -0/+29 | |
* | | | | | | | | | | | | | | Merge branch '46668-make-the-html-attribute-on-the-blob-json-call-optional' i... | Douwe Maan | 2018-06-15 | 3 | -6/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Reuse viewer param and move logic to blob controller | Douwe Maan | 2018-06-15 | 4 | -10/+10 | |
| * | | | | | | | | | | | | | | Changed the query string parameter to a string46668-make-the-html-attribute-on-the-blob-json-call-optional | Tim Zallmann | 2018-06-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Fixed linting error with trailing space in rb | Tim Zallmann | 2018-06-14 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | Makes the html attribute in the json output optional with the option html_ren... | Tim Zallmann | 2018-06-14 | 3 | -1/+21 | |
* | | | | | | | | | | | | | | | Merge branch 'fix-flakey-remove-deploy-key-spec' into 'master' | Rémy Coutable | 2018-06-15 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix flakey time-sensitive remove deploy key specfix-flakey-remove-deploy-key-spec | Eric Eastwood | 2018-06-14 | 1 | -1/+2 | |
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'docs/fix-indentation-for-current-status-section' into 'master'45933-web-ide-review-styling | Marcia Ramos | 2018-06-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix indentation for 'Current status' section | Fabio Busatto | 2018-06-15 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'docs-assign-ancestor-group-milestones' into 'master' | Sean McGivern | 2018-06-15 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Remove line regarding future feature of assigning ancestor group milestonesdocs-assign-ancestor-group-milestones | Victor Wu | 2018-06-14 | 1 | -1/+0 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'fix-flakey-user-assignee-autocomplete-dropdown-specs' into 'mas... | Douwe Maan | 2018-06-15 | 1 | -25/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Update dropdown_assignee_spec with filtered_search_helpersfix-flakey-user-assignee-autocomplete-dropdown-specs | Eric Eastwood | 2018-06-14 | 1 | -19/+18 |