Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix copy.explain-wip-mr | Douwe Maan | 2015-05-17 | 1 | -1/+1 |
* | Add explanation about WIP status to MR form. | Douwe Maan | 2015-05-15 | 3 | -5/+13 |
* | Merge branch 'fix-653' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 1 | -1/+1 |
|\ | |||||
| * | Fix push event. | Douwe Maan | 2015-05-15 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-15 | 14 | -33/+50 |
|\ | |||||
| * | Merge branch 'dashboard-references' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 11 | -22/+30 |
| |\ | |||||
| | * | Fix reference links in dashboard activity and ATOM feeds.dashboard-references | Douwe Maan | 2015-05-14 | 11 | -22/+30 |
| * | | Merge branch 'spinner-spin' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 2 | -6/+7 |
| |\ \ | |||||
| | * | | Spin icon next to "Checking for CI status..."spinner-spin | Douwe Maan | 2015-05-14 | 2 | -6/+7 |
| | |/ | |||||
| * | | Merge branch 'use-count-badges' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 2 | -5/+13 |
| |\ \ | |||||
| | * | | Small refactoring of state_filters_text_for helperuse-count-badges | Dmitriy Zaporozhets | 2015-05-14 | 1 | -3/+2 |
| | * | | append empty space only if count exists | Dmitriy Zaporozhets | 2015-05-14 | 1 | -1/+1 |
| | * | | Use count badges with number_with_delimiter helper for issue, commit count | Dmitriy Zaporozhets | 2015-05-14 | 2 | -5/+14 |
* | | | | Merge pull request #9296 from jorgevbo/master | Jeroen van Baarsen | 2015-05-15 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix bug with default timezone en RSS gitlab events | Jorge Vasquez | 2015-05-14 | 1 | -1/+1 |
* | | | | Fix gemfile.lock | Dmitriy Zaporozhets | 2015-05-15 | 1 | -1/+1 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-14 | 8 | -12/+54 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'project_api_order' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 3 | -1/+18 |
| |\ \ \ | |||||
| | * | | | update API docproject_api_order | Valery Sizov | 2015-05-14 | 1 | -0/+3 |
| | * | | | Add order option for projects API | Valery Sizov | 2015-05-14 | 2 | -1/+15 |
| * | | | | Merge branch 'rs-refactor-2fa' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 2 | -9/+33 |
| |\ \ \ \ | |||||
| | * | | | | Refactor SessionsController to use a controller concernrs-refactor-2fa | Robert Speicher | 2015-05-14 | 2 | -9/+33 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix-blob-path' into 'master' | Douwe Maan | 2015-05-14 | 3 | -2/+3 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Fix broken view when viewing history of a file that includes a path that used... | Stan Hu | 2015-05-13 | 3 | -2/+3 |
* | | | | | Merge pull request #9295 from afc163/master | Jeroen van Baarsen | 2015-05-14 | 2 | -0/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add style for <kbd> element in markdown | afc163 | 2015-05-14 | 2 | -0/+17 |
|/ / / / | |||||
* | | | | Merge branch 'fewer-icons' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 1 | -6/+0 |
|\ \ \ \ | |||||
| * | | | | Use slightly fewer icons in project sidebar. | Douwe Maan | 2015-05-14 | 1 | -6/+0 |
|/ / / / | |||||
* | | | | Merge branch 'rs-relative-link-filter' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 3 | -85/+94 |
|\ \ \ \ | |||||
| * | | | | Minor RelativeLinkFilter cleanuprs-relative-link-filter | Robert Speicher | 2015-05-13 | 3 | -85/+94 |
| |/ / / | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-14 | 6 | -32/+33 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'fix-group-mention' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 3 | -3/+4 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Add changelog item.fix-group-mention | Douwe Maan | 2015-05-14 | 1 | -0/+1 |
| | * | | | Fix mentioning of private groups. | Douwe Maan | 2015-05-14 | 2 | -3/+3 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'note-action-icons' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 3 | -29/+29 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Always show note action icons. | Douwe Maan | 2015-05-14 | 3 | -29/+29 |
| |/ / | |||||
* | | | Merge branch 'omniauth-csrf' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 7 | -8/+82 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add reset_session for the :reset_session strategy. | Douwe Maan | 2015-04-24 | 1 | -1/+5 |
| * | | Protect OmniAuth request phase against CSRF. | Douwe Maan | 2015-04-24 | 7 | -9/+76 |
* | | | Merge branch 'upgrade-dockerfile-apt' into 'master' | Sytse Sijbrandij | 2015-05-14 | 2 | -15/+12 |
|\ \ \ | |||||
| * | | | Use apt repositories to upgrade Docker builds to the latest GitLab version | Stan Hu | 2015-05-13 | 2 | -15/+12 |
| | |/ | |/| | |||||
* | | | GitLab shell version to 2.6.3. | Marin Jankovski | 2015-05-14 | 1 | -1/+1 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-05-14 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge requests are welcome in spite of the deprecation. | Sytse Sijbrandij | 2015-05-13 | 1 | -1/+1 |
* | | | Merge branch 'sidekiq-sigkill' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 2 | -1/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use SIGKILL by default in Sidekiq::MemoryKiller | Jacob Vosmaer | 2015-05-13 | 2 | -1/+2 |
|/ / | |||||
* | | Fix text overflow in project sidebar | Dmitriy Zaporozhets | 2015-05-13 | 1 | -0/+4 |
* | | Merge branch 'text-batch-1' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 14 | -84/+98 |
|\ \ | |||||
| * | | Fix GitAccess.text-batch-1 | Douwe Maan | 2015-05-13 | 2 | -13/+6 |
| * | | Fix 422 error page. | Douwe Maan | 2015-05-13 | 1 | -1/+1 |