Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mention-all' into 'master' | Robert Speicher | 2015-12-27 | 3 | -3/+23 |
|\ | |||||
| * | Fix specmention-all | Douwe Maan | 2015-12-25 | 1 | -0/+2 |
| * | Merge branch 'master' into mention-all | Douwe Maan | 2015-12-24 | 2 | -1/+16 |
| |\ | |||||
| * | | Fix specs | Douwe Maan | 2015-12-24 | 2 | -0/+5 |
| * | | Only allow group/project members to mention `@all` | Douwe Maan | 2015-12-24 | 1 | -3/+16 |
* | | | Merge branch 'close-open-ajax-issue' into 'master' | Robert Speicher | 2015-12-25 | 2 | -1/+97 |
|\ \ \ | |||||
| * | | | removes unused `alert` from issue spec. Requires flash in the *implementation...close-open-ajax-issue | Jacob Schatz | 2015-12-23 | 2 | -8/+2 |
| * | | | adds test for issue close/reopen failure | Jacob Schatz | 2015-12-23 | 2 | -4/+60 |
| * | | | resolves conflicts with new buttons | Jacob Schatz | 2015-12-23 | 20 | -57/+576 |
| |\ \ \ | |||||
| * | | | | fixes tests to work with jasmine/jquery | Jacob Schatz | 2015-12-23 | 2 | -13/+16 |
| * | | | | adds alerts for when http request errors out in some way. | Jacob Schatz | 2015-12-21 | 1 | -10/+1 |
| * | | | | clarifies tests with methods like `toBeVisible()` etc. | Jacob Schatz | 2015-12-21 | 1 | -12/+9 |
| * | | | | updates tests style for four-phase-testing as per: https://robots.thoughtbot.... | Jacob Schatz | 2015-12-21 | 1 | -1/+17 |
| * | | | | open and close issue via ajax request. With tests | Jacob Schatz | 2015-12-21 | 2 | -1/+40 |
* | | | | | Merge branch 'revert_votes_back' into 'master' | Dmitriy Zaporozhets | 2015-12-25 | 2 | -3/+15 |
|\ \ \ \ \ | |||||
| * | | | | | satisfy rubocoprevert_votes_back | Valery Sizov | 2015-12-25 | 1 | -1/+1 |
| * | | | | | add sorting of awards | Valery Sizov | 2015-12-25 | 1 | -0/+7 |
| * | | | | | revert back vote buttons to issue and MR pages | Valery Sizov | 2015-12-25 | 1 | -3/+8 |
* | | | | | | Merge branch 'rs-opengraph' into 'master' | Douwe Maan | 2015-12-25 | 2 | -0/+147 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Satisfy Rubocop | Douwe Maan | 2015-12-25 | 1 | -2/+2 |
| * | | | | | Add support for `twitter:label` meta tagsrs-opengraph | Robert Speicher | 2015-12-24 | 2 | -0/+47 |
| * | | | | | Truncate page_description to 30 words | Robert Speicher | 2015-12-24 | 1 | -0/+13 |
| * | | | | | Account for `@project.description` being nil | Robert Speicher | 2015-12-23 | 1 | -0/+8 |
| * | | | | | Add page descriptions and images | Robert Speicher | 2015-12-23 | 1 | -0/+79 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'support-api-lookup-by-username' into 'master' | Dmitriy Zaporozhets | 2015-12-25 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Add API support for looking up a user by username | Stan Hu | 2015-12-24 | 1 | -0/+7 |
* | | | | | | specs for forced two-factor authentication and grace period | Gabriel Mazetto | 2015-12-24 | 1 | -0/+52 |
* | | | | | | WIP require two factor authentication | Gabriel Mazetto | 2015-12-24 | 1 | -0/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'ldap-special-chars-fix' into 'master' | Douwe Maan | 2015-12-24 | 1 | -0/+15 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix identity and user retrieval when special characters are used | Patricio Cano | 2015-12-22 | 1 | -0/+15 |
* | | | | | Fix NewBranchForm spec | Douwe Maan | 2015-12-24 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'fix-milestones-with-slashes' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | Fix Error 500 when global milestones have slashes | Stan Hu | 2015-12-22 | 1 | -0/+10 |
| |/ / / | |||||
* | | | | Merge branch 'edit-on-fork' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Fix specs | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
| * | | | | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
* | | | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' | Douwe Maan | 2015-12-24 | 2 | -0/+63 |
|\ \ \ \ \ | |||||
| * | | | | | Add some specs for forked project visibility_level cases | Tomasz Maczukin | 2015-12-24 | 2 | -0/+63 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'branch-invalid-name' into 'master' | Douwe Maan | 2015-12-24 | 3 | -1/+165 |
|\ \ \ \ \ | |||||
| * | | | | | Add helper methods to JS validation spec for invalid branch namesbranch-invalid-name | Douglas Barbosa Alexandre | 2015-12-22 | 1 | -87/+92 |
| * | | | | | Fix minor stylistic complaints | Douglas Barbosa Alexandre | 2015-12-21 | 1 | -34/+34 |
| * | | | | | Fix spec | Douglas Barbosa Alexandre | 2015-12-18 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into branch-invalid-name | Douglas Barbosa Alexandre | 2015-12-18 | 2 | -4/+23 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Add specs for JS validation for invalid characters in branch name | Douglas Barbosa Alexandre | 2015-12-17 | 2 | -0/+159 |
* | | | | | | Merge branch 'emoji-picker-fix' into 'master' | Valery Sizov | 2015-12-24 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | fix specemoji-picker-fix | Valery Sizov | 2015-12-24 | 1 | -2/+2 |
* | | | | | | Merge branch 'add-project-permissions' into 'master' | Dmitriy Zaporozhets | 2015-12-23 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add project permissions to all project API endpoints | Stan Hu | 2015-12-22 | 1 | -0/+13 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'fix/ci-runners-token-persistence' into 'master' | Grzegorz Bizon | 2015-12-23 | 3 | -8/+18 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Use method that creates runners registration token | Grzegorz Bizon | 2015-12-23 | 2 | -2/+1 |