Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable the `RSpec/ExpectActual` cop and correct offenses | Robert Speicher | 2017-02-10 | 2 | -55/+49 |
* | 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove a transient failure from spec/requests/api/groups_spec.rbrs-issue-27974 | Robert Speicher | 2017-02-09 | 2 | -3/+24 |
* | | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' | Jacob Schatz | 2017-02-10 | 1 | -2/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titles | Phil Hughes | 2017-01-26 | 1 | -2/+10 |
* | | | | | Merge branch 'revert-0ef587b6' into 'master' | Filipa Lacerda | 2017-02-09 | 2 | -16/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Fix expand_collapse_diffs specsrevert-0ef587b6 | Annabel Dunstone Gray | 2017-02-09 | 1 | -6/+6 |
| * | | | | | Use a new class to keep old behavior | Filipa Lacerda | 2017-02-08 | 2 | -16/+16 |
* | | | | | | Merge branch 'rs-gemfetcher-cop-spec' into 'master' | Sean McGivern | 2017-02-09 | 1 | -0/+46 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a spec for our custom GemFetcher coprs-gemfetcher-cop-spec | Robert Speicher | 2017-02-09 | 1 | -0/+46 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'upgrade-babel-v6' into 'master' | Alfredo Sumaran | 2017-02-09 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix failing karma test | Mike Greiling | 2017-02-09 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master' | Rémy Coutable | 2017-02-09 | 1 | -0/+49 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Move 'User Snippets' Spinach feature to Rspec | the-undefined | 2017-01-16 | 1 | -0/+49 |
* | | | | | | Correctly transform an anchor link to GFM when copying it | Douwe Maan | 2017-02-09 | 1 | -0/+2 |
* | | | | | | Merge branch 'issue_26701' into 'master' | Sean McGivern | 2017-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Remove JIRA closed status iconissue_26701 | Felipe Artur | 2017-02-08 | 1 | -1/+1 |
* | | | | | | Merge branch 'dz-create-nested-groups-via-ui' into 'master' | Dmitriy Zaporozhets | 2017-02-09 | 1 | -1/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow creating nested group via UIdz-create-nested-groups-via-ui | Dmitriy Zaporozhets | 2017-02-07 | 1 | -1/+18 |
* | | | | | | | Merge branch 'dz-nested-groups-api' into 'master' | Dmitriy Zaporozhets | 2017-02-09 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Add nested groups to the APIdz-nested-groups-api | Dmitriy Zaporozhets | 2017-02-08 | 1 | -0/+14 |
* | | | | | | | Merge branch 'dm-add-column-with-default-cop' into 'master' | Douwe Maan | 2017-02-09 | 1 | -0/+41 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add cop that checks if add_column_with_default is used with up/down methods | Douwe Maan | 2017-02-08 | 1 | -0/+41 |
* | | | | | | | | Merge branch 'remove-jquery-ui-datepicker' into 'master' | Jacob Schatz | 2017-02-08 | 4 | -17/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Changed date check testremove-jquery-ui-datepicker | Phil Hughes | 2017-02-06 | 1 | -19/+23 |
| * | | | | | | | | Fixed missing edit link click | Phil Hughes | 2017-02-06 | 1 | -1/+3 |
| * | | | | | | | | Fixed some specs | Phil Hughes | 2017-02-06 | 4 | -31/+29 |
* | | | | | | | | | Merge branch 'remove-jquery-ui-sortable' into 'master' | Jacob Schatz | 2017-02-08 | 4 | -17/+32 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Removed jQuery UI sortableremove-jquery-ui-sortable | Phil Hughes | 2017-02-06 | 4 | -17/+32 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'dz-fix-route-rename-descendants' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 1 | -6/+18 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix route rename descendants if route.name is blank | Dmitriy Zaporozhets | 2017-02-08 | 1 | -6/+18 |
* | | | | | | | | | Merge branch 'bypass-whitelist-for-external-user' into 'master' | Robert Speicher | 2017-02-08 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Bypass signup domain validation for external users | Reza Mohammadi | 2017-02-08 | 1 | -0/+10 |
* | | | | | | | | | Merge branch '27756-fix-json-404-response' into 'master' | Clement Ho | 2017-02-08 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ |