Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-search | Valery Sizov | 2015-12-24 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into emoji-picker-search | Valery Sizov | 2015-12-24 | 42 | -106/+203 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fixes after review | Valery Sizov | 2015-12-24 | 5 | -7/+7 | |
| * | | | | | | | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-search | Valery Sizov | 2015-12-24 | 8 | -45/+13791 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | emoji picker search | Valery Sizov | 2015-12-23 | 6 | -1/+47 | |
* | | | | | | | | | | | | | Merge branch 'fix-milestones-with-slashes' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 3 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix Error 500 when global milestones have slashes | Stan Hu | 2015-12-22 | 3 | -1/+14 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'new-nav-width' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | nav full widthnew-nav-width | Andriy Dyadyura | 2015-12-24 | 1 | -0/+2 | |
* | | | | | | | | | | | | | Merge branch 'edit-on-fork' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 31 | -307/+596 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix specedit-on-fork | Douwe Maan | 2015-12-21 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Add tests for new functionality | Douwe Maan | 2015-12-21 | 3 | -15/+122 | |
| * | | | | | | | | | | | | Fix specs | Douwe Maan | 2015-12-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Merge branch 'master' into edit-on-fork | Douwe Maan | 2015-12-18 | 11 | -61/+66 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix specs | Douwe Maan | 2015-12-18 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | Fix specs and behavior for LFS files | Douwe Maan | 2015-12-18 | 7 | -19/+25 | |
| * | | | | | | | | | | | | | Satisfy Rubocop | Douwe Maan | 2015-12-18 | 3 | -4/+4 | |
| * | | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 29 | -273/+452 | |
* | | | | | | | | | | | | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' | Douwe Maan | 2015-12-24 | 7 | -14/+121 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Add some specs for forked project visibility_level cases | Tomasz Maczukin | 2015-12-24 | 2 | -0/+63 | |
| * | | | | | | | | | | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-12-21 | 1125 | -13108/+17540 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-11-20 | 500 | -3113/+9065 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Change update_forks_visibility_level into after_update hook in Project model | Tomasz Maczukin | 2015-11-20 | 2 | -14/+13 | |
| * | | | | | | | | | | | | | | | | Prevent unnecessary forks iteration at parent update | Tomasz Maczukin | 2015-11-19 | 1 | -3/+5 | |
| * | | | | | | | | | | | | | | | | Change forks method to has_many relation | Tomasz Maczukin | 2015-11-18 | 2 | -8/+6 | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-11-06 | 53 | -243/+282 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-11-04 | 52 | -140/+399 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Update forks visibility_level after parent project visibility_level change | Tomasz Maczukin | 2015-11-04 | 2 | -14/+40 | |
| * | | | | | | | | | | | | | | | | | | Fix GitlabV::isibilityLevel::level_name method | Tomasz Maczukin | 2015-11-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | Fix Project update service | Tomasz Maczukin | 2015-11-03 | 2 | -1/+10 | |
| * | | | | | | | | | | | | | | | | | | Move level_name resolving to Gitlan::VisibilityLevel | Tomasz Maczukin | 2015-11-03 | 2 | -4/+10 | |
| * | | | | | | | | | | | | | | | | | | Move visibility_level check for forked projects to Project model | Tomasz Maczukin | 2015-11-03 | 2 | -2/+6 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'branch-invalid-name' into 'master' | Douwe Maan | 2015-12-24 | 8 | -9/+251 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | 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 | 3 | -39/+38 | |
| * | | | | | | | | | | | | | | | | | | | Fix spec | Douglas Barbosa Alexandre | 2015-12-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into branch-invalid-name | Douglas Barbosa Alexandre | 2015-12-18 | 29 | -289/+420 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Add specs for JS validation for invalid characters in branch name | Douglas Barbosa Alexandre | 2015-12-17 | 2 | -0/+159 | |
| * | | | | | | | | | | | | | | | | | | | | Add restriction for single characters in branch name | Douglas Barbosa Alexandre | 2015-12-17 | 1 | -2/+8 | |
| * | | | | | | | | | | | | | | | | | | | | Remove extra spaces in the error messages | Douglas Barbosa Alexandre | 2015-12-17 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | Add JS validation for invalid characters in branch name | Douglas Barbosa Alexandre | 2015-12-17 | 5 | -8/+81 | |
| * | | | | | | | | | | | | | | | | | | | | Remove the hint on the branch name input | Douglas Barbosa Alexandre | 2015-12-16 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | Add more descriptive error message when create branch with invalid name | Douglas Barbosa Alexandre | 2015-12-16 | 3 | -2/+3 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'issue_4189' into 'master' | Douwe Maan | 2015-12-24 | 3 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189 | Rubén Dávila | 2015-12-21 | 3 | -1/+13 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'emoji-picker-fix' into 'master' | Valery Sizov | 2015-12-24 | 9 | -47/+13793 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | fix specemoji-picker-fix | Valery Sizov | 2015-12-24 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Emoji picker: better alias handling | Valery Sizov | 2015-12-24 | 8 | -45/+13791 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs-bump-underscore-rails' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Bump underscore-rails to ~> 1.8.0rs-bump-underscore-rails | Robert Speicher | 2015-12-23 | 2 | -3/+3 |