Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correct typo.regression-issue | dosire | 2014-05-26 | 1 | -1/+1 |
| | |||||
* | Add any known bugs. | dosire | 2014-05-26 | 1 | -1/+3 |
| | |||||
* | Have the issue for the entire monthly time. | dosire | 2014-05-26 | 1 | -2/+2 |
| | |||||
* | A regressions issue to improve communication. | dosire | 2014-05-26 | 1 | -0/+9 |
| | |||||
* | Merge branch 'monthly_doc_update' into 'master' | Marin Jankovski | 2014-05-26 | 1 | -19/+62 |
|\ | | | | | | | Monthly release doc update | ||||
| * | Add proposed email for mailchimp. | Marin Jankovski | 2014-05-22 | 1 | -0/+2 |
| | | |||||
| * | add newsletter to release doc | Job van der Voort | 2014-05-22 | 1 | -0/+6 |
| | | | | | | | | | | Conflicts: doc/release/monthly.md | ||||
| * | Update casing of gitlab.com. | Marin Jankovski | 2014-05-22 | 1 | -3/+3 |
| | | |||||
| * | Updates for the monthly release document. | Marin Jankovski | 2014-05-22 | 1 | -18/+51 |
| | | |||||
| * | Fix typo. | Marin Jankovski | 2014-05-19 | 1 | -1/+1 |
| | | |||||
| * | Recommend issue name. | Marin Jankovski | 2014-05-19 | 1 | -0/+2 |
| | | |||||
* | | Even more tests fixed :) | Dmitriy Zaporozhets | 2014-05-24 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Fix help tests | Dmitriy Zaporozhets | 2014-05-24 | 2 | -14/+3 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Fix branches tests | Dmitriy Zaporozhets | 2014-05-24 | 3 | -12/+8 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Fix specs. Fix note form reset after submit | Dmitriy Zaporozhets | 2014-05-24 | 5 | -37/+3 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'ui-improvements' into 'master' | Dmitriy Zaporozhets | 2014-05-24 | 8 | -87/+81 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Comment UI improvements * use tabs for preview/write comment form because its better UX * fix paddings for comment form and unnecessary borders * remove unused css/js * cleanup messy comment form html | ||||
| * | | Remove unused css | Dmitriy Zaporozhets | 2014-05-24 | 1 | -17/+0 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Improve notes form UI/UX | Dmitriy Zaporozhets | 2014-05-24 | 7 | -58/+75 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Improve comments css | Dmitriy Zaporozhets | 2014-05-24 | 1 | -12/+6 |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Add drag-n-drop to CHANGELOG | Dmitriy Zaporozhets | 2014-05-24 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | More stuff to CHANGELOG | Dmitriy Zaporozhets | 2014-05-23 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'explain-setting' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 1 | -0/+4 |
|\ \ | | | | | | | | | | Explain setting | ||||
| * | | Project visibility setting is missed by people sometimes. | dosire | 2014-05-23 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'missing-items-changelog' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | Missing items changelog | ||||
| * | | | Add threaded emails to changelog. | dosire | 2014-05-23 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'branch-creation-flow' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 4 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Branch creation flow To improve user experience with web editing I did next improvements: * when create branch via ui - redirect to tree view so you start add/edit files * when click on branch name - redirect to tree view instead of commits so you can immedialty add/edit files | ||||
| * | | | | Fix tests | Dmitriy Zaporozhets | 2014-05-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Branch link on branches page goes to tree view instead of commits | Dmitriy Zaporozhets | 2014-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Redirect to tree view after branch created | Dmitriy Zaporozhets | 2014-05-23 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'move-protected-branches' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 13 | -119/+109 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Move protected branches to Project settings page Because all settings should be in one place | ||||
| * | | | | Move protected branches to Project settings | Dmitriy Zaporozhets | 2014-05-23 | 13 | -119/+109 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'license-to-bv' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 5 | -18/+18 |
|\ \ \ \ | | | | | | | | | | | | | | | | License to bv | ||||
| * | | | | Change the license to B.V. | dosire | 2014-05-23 | 5 | -18/+18 |
|/ / / / | |||||
* | | | | Merge branch 'api-branch-deletion' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 3 | -2/+43 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | Api branch deletion Fixes #1127 | ||||
| * | | | Improve branch deletion via API | Dmitriy Zaporozhets | 2014-05-23 | 3 | -2/+43 |
| |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Marin Jankovski | 2014-05-23 | 3 | -38/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'merge-marshal' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | Merge marshal | ||||
| | * | | | Renamed based on suggestion Martijn. | dosire | 2014-05-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'remove-features-raketask' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 2 | -37/+0 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove features raketask As discussed Fixes #1179 | ||||
| | * | | | The 4.0 raketask is no longer needed and rebuilding of missing satellites is ↵ | dosire | 2014-05-22 | 2 | -37/+0 |
| | | | | | | | | | | | | | | | | | | | | automatic. | ||||
* | | | | | Replace jquery deprecated .live with .on | Marin Jankovski | 2014-05-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Fix branch protection help doc | Dmitriy Zaporozhets | 2014-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Mention changes to protected branches | Dmitriy Zaporozhets | 2014-05-23 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge pull request #7011 from erbunao/drag-and-drop_markdown | Dmitriy Zaporozhets | 2014-05-23 | 30 | -46/+363 |
|\ \ \ \ | | | | | | | | | | | Implements drag and drop upload of image in every markdown-area | ||||
| * | | | | Implements drag and drop upload in creating issues | Earle Bunao & Neil Calabroso | 2014-05-23 | 30 | -46/+363 |
|/ / / / | |||||
* | | | | Fix spinach tests | Dmitriy Zaporozhets | 2014-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'api-remove-branch' into 'master' | Dmitriy Zaporozhets | 2014-05-23 | 7 | -22/+90 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New rules for protected branches This MR change permissions logic for branch removal. Changes listed below: Before * developer can remove branch with terminal but not in UI * masters can remove any branch with UI even protected one * force-push to protected branch is not allowed but remove is allowed After * none can force push or remove protected branches * developers and masters can remove normal branches with console and UI | ||||
| * | | | | Improve protected branch explanation | Dmitriy Zaporozhets | 2014-05-22 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Dont allow remove of protected branch | Dmitriy Zaporozhets | 2014-05-22 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Api call to remove branch | Dmitriy Zaporozhets | 2014-05-22 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |