Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-lines | Douwe Maan | 2017-02-13 | 1 | -0/+11 |
* | Merge branch 'dynamic-header-fixture' into 'master' | Clement Ho | 2017-02-13 | 2 | -36/+1 |
|\ | |||||
| * | Replace static fixture for header_spec.js (!9174) | winniehell | 2017-02-13 | 2 | -36/+1 |
* | | Merge branch 'new-branch-fixture' into 'master' | Clement Ho | 2017-02-13 | 3 | -6/+30 |
|\ \ | |||||
| * | | Replace static fixture for new_branch_spec.js (!9131) | winniehell | 2017-02-11 | 3 | -6/+30 |
* | | | Merge branch 'fix/cycle-analytics-events-limit' into 'master' | Sean McGivern | 2017-02-13 | 1 | -0/+45 |
|\ \ \ | |||||
| * | | | fix spec | James Lopez | 2017-02-07 | 1 | -4/+5 |
| * | | | add spec | James Lopez | 2017-02-06 | 2 | -35/+44 |
| * | | | user project and not empty_project as we need the repo stuff | James Lopez | 2017-02-06 | 1 | -1/+1 |
| * | | | fix typo [ci skip] | James Lopez | 2017-02-06 | 1 | -2/+2 |
| * | | | Add limit to the number of events showed in cycle analytics and spec | James Lopez | 2017-02-06 | 1 | -0/+35 |
* | | | | Merge branch '27886_rebasing_fix' into 'master' | Sean McGivern | 2017-02-13 | 1 | -9/+32 |
|\ \ \ \ | |||||
| * | | | | Mark as WIP based on MR commits only | Jarka Kadlecova | 2017-02-13 | 1 | -9/+32 |
* | | | | | Merge branch '24976-start-of-line-mention' into 'master' | Sean McGivern | 2017-02-13 | 3 | -1/+284 |
|\ \ \ \ \ | |||||
| * | | | | | Create directly_addressed Todos when mentioned in beginning of a line | Ershad Kunnakkadan | 2017-02-08 | 3 | -1/+284 |
* | | | | | | Merge branch '20732_member_exists_409' into 'master' | Sean McGivern | 2017-02-13 | 2 | -2/+344 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add member: Always return 409 when a member exists | Jarka Kadlecova | 2017-02-10 | 2 | -2/+344 |
* | | | | | | | Merge branch 'issue_25900_2' into 'master' | Sean McGivern | 2017-02-13 | 5 | -0/+117 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2 | Felipe Artur | 2017-02-09 | 5 | -0/+117 |
* | | | | | | | | Merge branch 'fix_issue_from_milestone' into 'master' | Rémy Coutable | 2017-02-13 | 3 | -2/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix issue creation from milestone doesn't assign the milestone | wendy0402 | 2017-02-12 | 3 | -2/+12 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'concurrent-foreign-keys' into 'master' | Rémy Coutable | 2017-02-13 | 2 | -6/+103 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keys | Yorick Peterse | 2017-02-10 | 1 | -0/+33 |
| * | | | | | | | | Add method for creating foreign keys concurrently | Yorick Peterse | 2017-02-10 | 1 | -6/+70 |
* | | | | | | | | | Merge branch 'rename_files_delete_service' into 'master' | Rémy Coutable | 2017-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Rename Files::DeleteService to Files::DestroyService | dixpac | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-files | Mike Greiling | 2017-02-11 | 1 | -1/+1 |
* | | | | | | | | | convert timeago.js dependency to an npm module | Mike Greiling | 2017-02-11 | 1 | -1/+1 |
* | | | | | | | | | Fix comment button test for slash commands | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | Fix time tracking spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | Fix issue boards sidebar alignment and sidebar toggle spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | Fix failing conflicts test | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | Remove fixed positioning from navbar | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'replace-teaspoon-references' into 'master' | Clement Ho | 2017-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Replace teaspoon references with Karmareplace-teaspoon-references | Clement Ho | 2017-02-10 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch '27963-tooltips-jobs' into 'master' | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix broken test to use trigger in order to not take tooltip overlaping in con... | Filipa Lacerda | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rs-warden-blocked-users' into 'master' | Robert Speicher | 2017-02-10 | 3 | -54/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users | Robert Speicher | 2017-02-10 | 3 | -54/+34 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '1051-api-create-users-without-password' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Optionally make users created via the API set their password | Joost Rijneveld | 2017-02-09 | 1 | -0/+12 |
* | | | | | | | | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' | Kamil Trzciński | 2017-02-10 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-page | Luke "Jared" Bennett | 2017-02-10 | 1 | -0/+16 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' | Dmitriy Zaporozhets | 2017-02-10 | 3 | -0/+80 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Show parent group members for nested groupdz-nested-groups-members-page | Dmitriy Zaporozhets | 2017-02-10 | 3 | -0/+80 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'issue_27855' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix admin_labels_spec.rb transient failureissue_27855 | Felipe Artur | 2017-02-10 | 1 | -5/+6 |
* | | | | | | | | | Merge branch 'test-for-current-gitlab-ci-yml' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-yml | Lin Jen-Shin | 2017-02-10 | 1 | -0/+10 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'rs-issue-27974' into 'master' | Rémy Coutable | 2017-02-10 | 2 | -3/+24 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |