summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 7.1.0 startedDmitriy Zaporozhets2014-06-242-1/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* More noticable filter iconsDmitriy Zaporozhets2014-06-241-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix some MR commenting testsDmitriy Zaporozhets2014-06-241-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'improve-discussions' into 'master'Dmitriy Zaporozhets2014-06-2410-87/+115
|\ | | | | | | | | | | Improve discussions Implement outdated discussion detection
| * CleanupDmitriy Zaporozhets2014-06-242-39/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve discussionsDmitriy Zaporozhets2014-06-2411-52/+119
|/ | | | | | | * check for outdated discussions by comparing diff * improve discussion UI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont render difscussion for commit diffsDmitriy Zaporozhets2014-06-242-26/+28
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'oauth_errors' into 'master'Dmitriy Zaporozhets2014-06-2411-24/+62
|\ | | | | | | Oauth errors page
| * Improve error page layoutDmitriy Zaporozhets2014-06-248-27/+33
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Error page.Marin Jankovski2014-06-241-0/+12
| |
| * Use an error page when oauth fails.Marin Jankovski2014-06-242-1/+10
| |
| * Return better error when account exists when attempting oauth account create.Marin Jankovski2014-06-242-5/+16
| |
* | Merge branch 'fix-namespace-select' into 'master'Dmitriy Zaporozhets2014-06-241-1/+1
|\ \ | | | | | | | | | | | | | | | Fix namespace select Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/371
| * | Fix namespace selector on Projects#new pageDmitriy Zaporozhets2014-06-241-1/+1
| |/ | | | | | | | | | | | | | | If user does not own any group he does not see namespace selector when visit new project page even if he has master membership in one of groups. This commit fixes it. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'mr-improve-comments' into 'master'Dmitriy Zaporozhets2014-06-242-3/+20
|\ \ | | | | | | | | | | | | | | | Improve merge request comments Fixes #1338
| * | Improve merge request commentsDmitriy Zaporozhets2014-06-242-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | When add diff note on 'Changes' page - and then go to 'Discussions' tab you will not see this discussion unless you reload a page. This commit fixes it by rendering discussion on 'Discussion' page as soon as you submit comment on 'Changes' page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Show README link only if repository exists and not emptyDmitriy Zaporozhets2014-06-241-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-reply-button' into 'master'Dmitriy Zaporozhets2014-06-245-15/+23
|\ \ \ | |/ / | | / | |/ |/| | | Fix reply button Don't show reply button if user is not signed in. Fixes #1360
| * Dont show reply button if user is not signed inDmitriy Zaporozhets2014-06-241-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move reply button to helper from viewDmitriy Zaporozhets2014-06-245-15/+21
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-06-241-0/+4
|\
| * Merge branch 'link-to-readme-from-description' into 'master'Dmitriy Zaporozhets2014-06-241-0/+4
| |\ | | | | | | | | | | | | | | | Link to readme from description If you are viewing a repository for the first time you are likely to view the description. If you want to keep reading after that you can now click a link to the readme. This place is in addition to the README button at the bottom of the right hand menu that is harder to find. If you have edit rights only the description edit button is shown to ensure the text fits, the assumption is that the readme is most interesting for people not yet added to the project.
| | * Remove button code from readme link.link-to-readme-from-descriptionSytse Sijbrandij2014-06-241-1/+1
| | |
| | * Allow for the readme not to exist.Sytse Sijbrandij2014-06-231-1/+1
| | |
| | * Link to readme from description if you don't have edit rights on the repository.Sytse Sijbrandij2014-06-231-0/+4
| | |
* | | Merge branch 'add-redis-requirements' into 'master'Jacob Vosmaer2014-06-241-1/+9
|\ \ \ | |/ / |/| | | | | | | | | | | Add redis requirements Based on https://groups.google.com/d/msgid/gitlabhq/f60a1b62-e722-4560-b98d-de8e3888dda0%40googlegroups.com?utm_medium=email&utm_source=footer
| * | Change Redis to 25k.Sytse Sijbrandij2014-06-241-1/+1
| | |
| * | Some background on Redis and Sidekiq requirements.Sytse Sijbrandij2014-06-241-1/+9
|/ /
* | Merge pull request #7162 from olivierlambert/patch-1Dmitriy Zaporozhets2014-06-241-1/+1
|\ \ | | | | | | Missing quote in the install doc
| * | Missing quote in the install docOlivier Lambert2014-06-201-1/+1
| | | | | | | | | Just a minor fix ;)
* | | Merge pull request #6992 from skv-headless/project_commits_sql_optimizationDmitriy Zaporozhets2014-06-243-4/+15
|\ \ \ | | | | | | | | notes count in 1 query for mr and commits
| * | | notes count in 1 query for mr and commitsskv2014-06-103-4/+15
| | | |
* | | | Merge pull request #7013 from jvanbaarsen/better-webhook-informationDmitriy Zaporozhets2014-06-247-6/+45
|\ \ \ \ | | | | | | | | | | Return a little more information in Issue webhook
| * | | | Fixed the specJeroen van Baarsen2014-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | | | Added an UrlBuilder for building rails named routesJeroen van Baarsen2014-06-133-4/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | | | Return a little more information in Issue webhookJeroen van Baarsen2014-06-135-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a webhook for issues is triggered, it should also return the resource URL, and the action that was performed (ie: Was it reopened, updated, opened or closed)
* | | | | Merge pull request #5531 from NotSqrt/add-searchDmitriy Zaporozhets2014-06-244-2/+15
|\ \ \ \ \ | | | | | | | | | | | | Add ability to search in issue description and issue comments
| * | | | | Update ability to search in issue descriptions and commentsNotSqrt2014-05-154-2/+15
| | | | | |
| * | | | | merge into current masterNotSqrt2014-05-151325-175825/+28285
| |\ \ \ \ \
| * | | | | | Add ability to search in issue description and issue commentsHenri Colas2013-11-043-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * edit queries in serach context * edit template for result
* | | | | | | Merge pull request #7082 from erbunao/fix_clipboardDmitriy Zaporozhets2014-06-241-1/+101
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for copy-pasting formatted text to markdown area
| * | | | | | | Fix for copy paste formatted texterbunao2014-06-051-1/+101
| | | | | | | |
* | | | | | | | Merge pull request #7140 from Mik-die/masterDmitriy Zaporozhets2014-06-242-0/+94
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Gitlab to Teatro.io
| * | | | | | | | teatro setupMikdiet2014-06-172-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create teatro db before setup force teatro setup config for teatro teatro setup rename gitlab.yml.teatro -> gitlab.teatro.yml
* | | | | | | | | Merge pull request #7167 from Razer6/doc/add_create_milestone_permissionDmitriy Zaporozhets2014-06-241-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes #7148, Add 'create milestone permission' to docs
| * | | | | | | | | Fixes #7148, Add 'create milestone permission' to docsRobert Schilling2014-06-211-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #7169 from cirosantilli/remove-center-elemDmitriy Zaporozhets2014-06-2411-11/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace HTML5 obsolete center element with CSS.
| * | | | | | | | | Replace HTML5 obsolete center element with CSS.Ciro Santilli2014-06-2111-11/+12
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #6901. Would generate invalid HTML5.
* | | | | | | | | Merge pull request #7177 from Totof6942/masterDmitriy Zaporozhets2014-06-242-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Small ui fix
| * | | | | | | | | Small ui fixChristophe Poulette2014-06-222-2/+2
| | | | | | | | | |
View Lorry Controller Status