Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-09Fixed some broken specsJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-07Merge pull request #7092 from jvanbaarsen/tmp-fix-for-rspecDmitriy Zaporozhets
Temp fix for rspec so the specs are run again
2014-06-07New entries to CHANGELOGDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-07Merge branch 'public-profile-info' into 'master'Dmitriy Zaporozhets
Public profile info Show small info about your profile being publicly because you joined public project![Screenshot 2014-06-07 15.17.17](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/eecf9a0bdc/Screenshot_2014-06-07_15.17.17.png) Fixes #1321
2014-06-07Merge branch 'namespace-route' into 'master'Dmitriy Zaporozhets
Namespace route Fixes #1312
2014-06-07Specify language detection for highlight.jsDmitriy Zaporozhets
Because I am tired of CHANGELOG highlighted as sql file :) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-07Show small notice at profile page about publicityDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-07Add users to /:id routeDmitriy Zaporozhets
So now when you type site/:username it redirects you to users page. And if you type site/:groupname it redirects you to group page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-07DB cleaner reverted to a known working versionJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-07Merge branch 'faster-diff-rendering' into 'master'Dmitriy Zaporozhets
Faster diff rendering 1. Dont render link in separate template but use helper instead 2. Don't build new object but just reuse variables New note for diff is rendered per each diff line. Such simple improvements gives us 20..100% better performance depends on diff size
2014-06-07Refactor link to new diff note renderingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Smaller event width for mobile devicesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Improve tree view for mobileDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Make visibility icon more noticableDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Use same color for icon, arrow and project title on dash sidebarDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Small UI improvementsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Improve select2 css to match bootstrap styleDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Disable fixturesJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-06Use bootstrap default padding for nav-tabsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-06Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2014-06-06Gem update for database_cleanerJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-06Merge branch 'protect_stable_branches' into 'master'Dmitriy Zaporozhets
Protect stable branches
2014-06-06Protect stable branchesJacob Vosmaer
2014-06-06Temp fix for rspec so the specs are run againJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-06Merge pull request #7090 from NARKOZ/api-files-accessDmitriy Zaporozhets
fix permissions for files API
2014-06-06Revert "Revert "Fix for failing specs""Dmitriy Zaporozhets
This reverts commit 2545b0f85851d1e4ebc1137a2c8786a238e02ee4.
2014-06-06Revert "Gemfile fix"Dmitriy Zaporozhets
This reverts commit 9bca8ae8f2feefe42acbdb61004ff5c3ec2a8a65.
2014-06-06fix permissions for files APINihad Abbasov
2014-06-05Merge pull request #7087 from jvanbaarsen/gemfilefixDmitriy Zaporozhets
Gemfile fix
2014-06-05Gemfile fixJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-05Merge pull request #7075 from jvanbaarsen/split-spinach-testsDmitriy Zaporozhets
Splitted the Spinach tests to prevent time-outs
2014-06-05Merge pull request #7086 from jvanbaarsen/revert-rspec-fixDmitriy Zaporozhets
Revert "Fix for failing specs"
2014-06-05Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2014-06-05Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2014-06-05Merge branch 'improve-projects-collecting' into 'master'Dmitriy Zaporozhets
Improve projects collecting Refactor code that cause unexpected AR behaviour. For example this works fine: @projects = Project.personal(@user).accessible_to(current_user) @groups = @user.groups.accessible_to(current_user) # OK But @projects = Project.all @groups = @user.groups.accessible_to(current_user) # PG:Error
2014-06-05Revert "Fix for failing specs"Jeroen van Baarsen
This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31. Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> Conflicts: Gemfile.lock
2014-06-05Refactor some search scopes to prevent wierd behaviour and PG::Error issuesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05Add GroupFinder for collection all groups user has access toDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05Merge pull request #7081 from cirosantilli/conflict-artifactSytse Sijbrandij
Remove conflict artifact.
2014-06-05Merge branch 'gitlab-ssl-nginx' into 'master'Sytse Sijbrandij
Move nginx ssl config from gitlab recipes I removed references to puma and did a minor cleanup :) Also updated the README in gitlab-recipes to point here. Once this gets merged I'll remove it from there.
2014-06-05Move gitlab-ssl nginx config from gitlab-recipesAchilleas Pipinellis
2014-06-05Merge branch 'milestone-merged-mr-list' into 'master'Dmitriy Zaporozhets
Milestone merged mr list Part of #1207
2014-06-05Add merged mrs list to milestone pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05Remove conflict artifact.Ciro Santilli
2014-06-05Merge branch 'milestone-mr-dragging' into 'master'Dmitriy Zaporozhets
Milestone merge request dragging This is part of #1207.
2014-06-05Merge request drag-n-drop on milestone pageDmitriy Zaporozhets
Allows moving milestone between 3 columns: unassigned, assigned, declined Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05Merge branch 'ruby2.1' into 'master'Dmitriy Zaporozhets
Ruby2.1 Fixed #1075
2014-06-05Merge pull request #7077 from bbodenmiller/patch-2Dmitriy Zaporozhets
improve no projects screen
2014-06-05Merge branch 'milestone-issues-dragging' into 'master'Dmitriy Zaporozhets
Milestone issues dragging This is part of #1207. I will submit this feature with small but finished merge requests.
2014-06-05Support Ruby 2.1 and better explain the memory requirements.Sytse Sijbrandij