Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adjust the SAML control flow to allow LDAP identities to be added to an exist... | Patricio Cano | 2016-06-06 | 1 | -0/+19 |
* | Merge branch 'issue_3359' into 'master' | Yorick Peterse | 2016-06-06 | 1 | -3/+10 |
|\ | |||||
| * | change add_concurrent_index function argumentsissue_3359 | Felipe Artur | 2016-06-06 | 1 | -3/+10 |
* | | Merge branch 'notes-are-awardables' into 'master' | Douwe Maan | 2016-06-06 | 8 | -13/+1270 |
|\ \ | |||||
| * | | Updated MR notes.notes-are-awardables | Fatih Acet | 2016-06-06 | 1 | -4/+4 |
| * | | Update tests on wording | Z.J. van de Weg | 2016-06-06 | 1 | -2/+2 |
| * | | Added tests for award emoji feature. | Fatih Acet | 2016-06-06 | 6 | -13/+1224 |
| * | | Backend awardables on comments | ZJ van de Weg | 2016-06-06 | 2 | -0/+46 |
* | | | Merge branch 'tests/extend-specs-for-build-badge' into 'master' | Rémy Coutable | 2016-06-06 | 1 | -3/+23 |
|\ \ \ | |||||
| * | | | Extend specs for builds badgetests/extend-specs-for-build-badge | Grzegorz Bizon | 2016-06-03 | 1 | -3/+23 |
* | | | | Merge branch 'jquery2' into 'master' | Jacob Schatz | 2016-06-06 | 2 | -12/+8 |
|\ \ \ \ | |||||
| * | | | | Fixed JS errorsjquery2 | Phil Hughes | 2016-06-05 | 2 | -12/+8 |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-06-06 | 14 | -27/+532 |
|\ \ \ \ \ | |||||
| * | | | | | Add feature specs covering U2F registration and authentication. | Timothy Andrew | 2016-06-06 | 2 | -0/+275 |
| * | | | | | Add a U2F-specific audit log entry after logging in. | Timothy Andrew | 2016-06-06 | 1 | -1/+25 |
| * | | | | | Implement authentication (login) using a U2F device. | Timothy Andrew | 2016-06-06 | 3 | -13/+66 |
| * | | | | | Implement U2F registration. | Timothy Andrew | 2016-06-06 | 4 | -7/+80 |
| * | | | | | Add a `U2fRegistrations` table/model. | Timothy Andrew | 2016-06-06 | 4 | -6/+86 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' | Douwe Maan | 2016-06-06 | 1 | -32/+136 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove 'unscoped' from project builds selection | Tomasz Maczukin | 2016-06-04 | 1 | -32/+136 |
* | | | | | Fix rubocop offense in awardable specsfix/rubocop-offense-in-specs | Grzegorz Bizon | 2016-06-06 | 1 | -3/+2 |
| |/ / / |/| | | | |||||
* | | | | Fix spec | Alfredo Sumaran | 2016-06-03 | 1 | -6/+7 |
* | | | | Spec label add / delete in UpdateService | Sean McGivern | 2016-06-03 | 1 | -0/+46 |
* | | | | Allow bulk-updating to remove all labels | Sean McGivern | 2016-06-03 | 1 | -0/+8 |
* | | | | Update CHANGELOG | Alfredo Sumaran | 2016-06-03 | 2 | -2/+2 |
* | | | | Enhancements | Alfredo Sumaran | 2016-06-03 | 1 | -7/+12 |
* | | | | Fix spec | Alfredo Sumaran | 2016-06-03 | 1 | -8/+9 |
* | | | | Fix failing specs | Alfredo Sumaran | 2016-06-03 | 1 | -6/+8 |
* | | | | Bulk assignment tests | Alfredo Sumaran | 2016-06-03 | 1 | -38/+120 |
* | | | | Tidy up BulkUpdateService specs | Sean McGivern | 2016-06-03 | 1 | -103/+97 |
* | | | | fixup! WIP: allow adding and removing labels in bulk | Sean McGivern | 2016-06-03 | 1 | -0/+148 |
* | | | | Add empty line to end of file | Alfredo Sumaran | 2016-06-03 | 1 | -1/+1 |
* | | | | Bulk assignment tests | Alfredo Sumaran | 2016-06-03 | 1 | -0/+109 |
|/ / / | |||||
* | | | Merge branch 'master' into awardablesawardables | Z.J. van de Weg | 2016-06-03 | 63 | -357/+1946 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' | Douwe Maan | 2016-06-03 | 2 | -0/+99 |
| |\ \ | |||||
| | * | | Don't allow merges with new commits | Sean McGivern | 2016-06-01 | 1 | -0/+86 |
| | * | | Add `sha` parameter to MR accept API | Sean McGivern | 2016-06-01 | 1 | -0/+13 |
| * | | | Merge branch 'banzai-user-filter-queries' | Douwe Maan | 2016-06-03 | 2 | -0/+64 |
| |\ \ \ | |||||
| | * | | | Reduce Namespace queries in UserReferenceFilterbanzai-user-filter-queries | Yorick Peterse | 2016-06-02 | 1 | -0/+19 |
| | * | | | Added ReferenceFilter#nodes | Yorick Peterse | 2016-06-02 | 1 | -0/+9 |
| | * | | | Returning enums in ReferenceFilter#each_node | Yorick Peterse | 2016-06-02 | 1 | -0/+36 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'todos-filter-project-delete' into 'master' | Douwe Maan | 2016-06-03 | 2 | -3/+16 |
| |\ \ \ | |||||
| | * | | | Fix failing todo teststodos-filter-project-delete | DJ Mountney | 2016-06-02 | 1 | -2/+2 |
| | * | | | Update target todo test to use a public project | DJ Mountney | 2016-06-02 | 1 | -1/+1 |
| | * | | | Use the project finder in the todos finder to limit todos to just ones within... | DJ Mountney | 2016-06-02 | 1 | -1/+1 |
| | * | | | Ensure we don't show TODOS for projects pending delete | DJ Mountney | 2016-06-02 | 1 | -0/+13 |
| * | | | | Merge branch '13313-fix-deprecation-warnings' into 'master' | Robert Speicher | 2016-06-03 | 1 | -4/+4 |
| |\ \ \ \ | |||||
| | * | | | | Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb13313-fix-deprecation-warnings | Rémy Coutable | 2016-06-02 | 1 | -4/+4 |
| | |/ / / | |||||
| * | | | | Update test since branch removal does not render template anymoredz-code-tab | Dmitriy Zaporozhets | 2016-06-03 | 1 | -4/+0 |
| * | | | | fix import service spec | James Lopez | 2016-06-02 | 1 | -1/+1 |