summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix copy.explain-wip-mrDouwe Maan2015-05-171-1/+1
* Add explanation about WIP status to MR form.Douwe Maan2015-05-153-5/+13
* Merge branch 'fix-653' into 'master'Dmitriy Zaporozhets2015-05-151-1/+1
|\
| * Fix push event.Douwe Maan2015-05-151-1/+1
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1514-33/+50
|\
| * Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets2015-05-1511-22/+30
| |\
| | * Fix reference links in dashboard activity and ATOM feeds.dashboard-referencesDouwe Maan2015-05-1411-22/+30
| * | Merge branch 'spinner-spin' into 'master'Dmitriy Zaporozhets2015-05-152-6/+7
| |\ \
| | * | Spin icon next to "Checking for CI status..."spinner-spinDouwe Maan2015-05-142-6/+7
| | |/
| * | Merge branch 'use-count-badges' into 'master'Dmitriy Zaporozhets2015-05-152-5/+13
| |\ \
| | * | Small refactoring of state_filters_text_for helperuse-count-badgesDmitriy Zaporozhets2015-05-141-3/+2
| | * | append empty space only if count existsDmitriy Zaporozhets2015-05-141-1/+1
| | * | Use count badges with number_with_delimiter helper for issue, commit countDmitriy Zaporozhets2015-05-142-5/+14
* | | | Merge pull request #9296 from jorgevbo/masterJeroen van Baarsen2015-05-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix bug with default timezone en RSS gitlab eventsJorge Vasquez2015-05-141-1/+1
* | | | Fix gemfile.lockDmitriy Zaporozhets2015-05-151-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-148-12/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'project_api_order' into 'master'Dmitriy Zaporozhets2015-05-143-1/+18
| |\ \ \
| | * | | update API docproject_api_orderValery Sizov2015-05-141-0/+3
| | * | | Add order option for projects APIValery Sizov2015-05-142-1/+15
| * | | | Merge branch 'rs-refactor-2fa' into 'master'Dmitriy Zaporozhets2015-05-142-9/+33
| |\ \ \ \
| | * | | | Refactor SessionsController to use a controller concernrs-refactor-2faRobert Speicher2015-05-142-9/+33
| |/ / / /
| * | | | Merge branch 'fix-blob-path' into 'master'Douwe Maan2015-05-143-2/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix broken view when viewing history of a file that includes a path that used...Stan Hu2015-05-133-2/+3
* | | | | Merge pull request #9295 from afc163/masterJeroen van Baarsen2015-05-142-0/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add style for <kbd> element in markdownafc1632015-05-142-0/+17
|/ / / /
* | | | Merge branch 'fewer-icons' into 'master'Dmitriy Zaporozhets2015-05-141-6/+0
|\ \ \ \
| * | | | Use slightly fewer icons in project sidebar.Douwe Maan2015-05-141-6/+0
|/ / / /
* | | | Merge branch 'rs-relative-link-filter' into 'master'Dmitriy Zaporozhets2015-05-143-85/+94
|\ \ \ \
| * | | | Minor RelativeLinkFilter cleanuprs-relative-link-filterRobert Speicher2015-05-133-85/+94
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-146-32/+33
|\ \ \ \
| * \ \ \ Merge branch 'fix-group-mention' into 'master'Dmitriy Zaporozhets2015-05-143-3/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add changelog item.fix-group-mentionDouwe Maan2015-05-141-0/+1
| | * | | Fix mentioning of private groups.Douwe Maan2015-05-142-3/+3
| | | |/ | | |/|
| * | | Merge branch 'note-action-icons' into 'master'Dmitriy Zaporozhets2015-05-143-29/+29
| |\ \ \ | | |/ / | |/| |
| | * | Always show note action icons.Douwe Maan2015-05-143-29/+29
| |/ /
* | | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-147-8/+82
|\ \ \ | |/ / |/| |
| * | Add reset_session for the :reset_session strategy.Douwe Maan2015-04-241-1/+5
| * | Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-247-9/+76
* | | Merge branch 'upgrade-dockerfile-apt' into 'master'Sytse Sijbrandij2015-05-142-15/+12
|\ \ \
| * | | Use apt repositories to upgrade Docker builds to the latest GitLab versionStan Hu2015-05-132-15/+12
| | |/ | |/|
* | | GitLab shell version to 2.6.3.Marin Jankovski2015-05-141-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-05-141-1/+1
|\ \ \ | |/ /
| * | Merge requests are welcome in spite of the deprecation.Sytse Sijbrandij2015-05-131-1/+1
* | | Merge branch 'sidekiq-sigkill' into 'master'Dmitriy Zaporozhets2015-05-132-1/+2
|\ \ \ | |/ / |/| |
| * | Use SIGKILL by default in Sidekiq::MemoryKillerJacob Vosmaer2015-05-132-1/+2
|/ /
* | Fix text overflow in project sidebarDmitriy Zaporozhets2015-05-131-0/+4
* | Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-1314-84/+98
|\ \
| * | Fix GitAccess.text-batch-1Douwe Maan2015-05-132-13/+6
| * | Fix 422 error page.Douwe Maan2015-05-131-1/+1