Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 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 |
| * | | Improve OAuth application flash messages. | Douwe Maan | 2015-05-13 | 1 | -5/+5 |
| * | | Improve OAuth signup error message. | Douwe Maan | 2015-05-13 | 2 | -4/+11 |
| * | | Improve description of branch protection levels. | Douwe Maan | 2015-05-13 | 1 | -3/+3 |
| * | | Improve Git access error messages. | Douwe Maan | 2015-05-13 | 3 | -45/+44 |
| * | | Improve text on error pages. | Douwe Maan | 2015-05-13 | 6 | -17/+32 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-13 | 1 | -6/+15 |
|\ \ \ | |||||
| * | | | remove strange code branchets | Sytse Sijbrandij | 2015-05-13 | 1 | -1/+1 |
| * | | | Deprecate the upgrader script since we forget to update it. | Sytse Sijbrandij | 2015-05-13 | 1 | -5/+14 |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-05-13 | 10 | -221/+275 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #9276 from jirutka/relative_link_filter | Dmitriy Zaporozhets | 2015-05-13 | 6 | -218/+242 |
| |\ \ \ \ | |||||
| | * | | | | Add spec for RelativeLinkFilter | Jakub Jirutka | 2015-05-12 | 2 | -73/+120 |
| | * | | | | RelativeLinkFilter: refactor according to suggestions by @tsigo | Jakub Jirutka | 2015-05-11 | 2 | -17/+13 |
| | * | | | | Extract handling of relative file links to RelativeLinkFilter | Jakub Jirutka | 2015-05-11 | 4 | -145/+126 |
| * | | | | | Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit | Jeroen van Baarsen | 2015-05-13 | 4 | -3/+33 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Call merge request web hook for each commits | Arthur Gautier | 2015-05-13 | 4 | -3/+33 |
* | | | | | | Merge branch 'version-check' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 9 | -10/+46 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Enable version check only for production environment | Dmitriy Zaporozhets | 2015-05-11 | 1 | -1/+3 |
| * | | | | | Replace host with real one | Dmitriy Zaporozhets | 2015-05-11 | 1 | -2/+1 |
| * | | | | | Fix syntax error | Dmitriy Zaporozhets | 2015-05-08 | 1 | -1/+1 |
| * | | | | | Merge branch 'version-check' into gl-version-check | Dmitriy Zaporozhets | 2015-05-08 | 9 | -10/+45 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove unnecessary public key | Dmitriy Zaporozhets | 2015-05-08 | 2 | -9/+1 |
| | * | | | | | Remove encryption | Dmitriy Zaporozhets | 2015-05-08 | 4 | -24/+7 |
| | * | | | | | Add feature to disable version check | Dmitriy Zaporozhets | 2015-03-10 | 6 | -5/+20 |