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 |
* | Use slightly fewer icons in project sidebar. | Douwe Maan | 2015-05-14 | 1 | -6/+0 |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-14 | 5 | -32/+32 |
|\ | |||||
| * | Merge branch 'fix-group-mention' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 2 | -3/+3 |
| |\ | |||||
| | * | Fix mentioning of private groups. | Douwe Maan | 2015-05-14 | 2 | -3/+3 |
| * | | Always show note action icons. | Douwe Maan | 2015-05-14 | 3 | -29/+29 |
| |/ | |||||
* | | Merge branch 'omniauth-csrf' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 2 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Protect OmniAuth request phase against CSRF. | Douwe Maan | 2015-04-24 | 2 | -3/+3 |
* | | 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 | 1 | -2/+9 |
|\ \ | |||||
| * | | Improve OAuth signup error message. | Douwe Maan | 2015-05-13 | 1 | -2/+9 |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-05-13 | 2 | -140/+15 |
|\ \ \ | |||||
| * \ \ | Merge pull request #9276 from jirutka/relative_link_filter | Dmitriy Zaporozhets | 2015-05-13 | 1 | -140/+0 |
| |\ \ \ | |||||
| | * | | | Extract handling of relative file links to RelativeLinkFilter | Jakub Jirutka | 2015-05-11 | 1 | -140/+0 |
| * | | | | Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit | Jeroen van Baarsen | 2015-05-13 | 1 | -0/+15 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Call merge request web hook for each commits | Arthur Gautier | 2015-05-13 | 1 | -0/+15 |
* | | | | | Merge branch 'version-check' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 5 | -1/+22 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Enable version check only for production environment | Dmitriy Zaporozhets | 2015-05-11 | 1 | -1/+3 |
| * | | | | Fix syntax error | Dmitriy Zaporozhets | 2015-05-08 | 1 | -1/+1 |
| * | | | | Merge branch 'version-check' into gl-version-check | Dmitriy Zaporozhets | 2015-05-08 | 5 | -1/+20 |
| |\ \ \ \ | |||||
| | * | | | | Remove encryption | Dmitriy Zaporozhets | 2015-05-08 | 1 | -3/+1 |
| | * | | | | Add feature to disable version check | Dmitriy Zaporozhets | 2015-03-10 | 4 | -4/+13 |
| | * | | | | Add version check to help page too | Dmitriy Zaporozhets | 2015-03-09 | 1 | -0/+1 |
| | * | | | | Prevent crash if file does not exists | Dmitriy Zaporozhets | 2015-03-09 | 1 | -1/+3 |
| | * | | | | Add version check badge to admin area | Dmitriy Zaporozhets | 2015-03-09 | 2 | -1/+10 |
* | | | | | | Merge branch 'fix-avatar-removal' into 'master' | Hannes Rosenögger | 2015-05-12 | 3 | -4/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix bug where avatar filenames were not actually deleted from the database du... | Stan Hu | 2015-05-07 | 3 | -4/+4 |
* | | | | | | Merge branch 'note-role' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 2 | -9/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show user roles by comments. | Douwe Maan | 2015-05-12 | 2 | -9/+28 |
* | | | | | | | Merge branch 'rs-system-note' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 8 | -235/+330 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Refactor SystemNoteService.cross_reference_disallowed? | Robert Speicher | 2015-05-11 | 1 | -6/+13 |
| * | | | | | | | Check if `system` is truthy in `Note.cross_reference?` | Robert Speicher | 2015-05-11 | 1 | -1/+1 |
| * | | | | | | | Update SystemNoteService method naming conventions | Robert Speicher | 2015-05-11 | 6 | -77/+73 |
| * | | | | | | | Remove legacy special case for emphasized reference notes | Robert Speicher | 2015-05-11 | 1 | -13/+9 |
| * | | | | | | | Add a SystemNoteService class | Robert Speicher | 2015-05-11 | 8 | -218/+320 |
| * | | | | | | | Simplify `Note#upvote?` and `Note#downvote?` | Robert Speicher | 2015-05-10 | 1 | -17/+11 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'project-page' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 8 | -81/+94 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move "Forked from" above "Version".project-page | Douwe Maan | 2015-05-12 | 1 | -8/+9 |
| * | | | | | | | Move clone panel to bottom of project sidebar. | Douwe Maan | 2015-05-12 | 1 | -3/+3 |
| * | | | | | | | Restructure project sidebar. | Douwe Maan | 2015-05-12 | 2 | -65/+81 |
| * | | | | | | | Fix alignment of ref picker, breadcrumb and buttons. | Douwe Maan | 2015-05-12 | 4 | -14/+3 |
| * | | | | | | | Add icons to more tabs. | Douwe Maan | 2015-05-12 | 2 | -1/+8 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '2fa' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 12 | -8/+222 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Handle password reset for users with 2FA enabled2fa | Robert Speicher | 2015-05-11 | 1 | -0/+21 |
| * | | | | | | Remove extra `devise` call that got added by accident | Robert Speicher | 2015-05-10 | 1 | -3/+0 |
| * | | | | | | Remove unnecessary User#login accessor override | Robert Speicher | 2015-05-09 | 1 | -5/+0 |
| * | | | | | | Clear all 2FA-related fields when user disables the feature | Robert Speicher | 2015-05-09 | 1 | -2/+7 |
| * | | | | | | Prevent "You are already signed in." error message upon 2FA login | Robert Speicher | 2015-05-09 | 1 | -2/+8 |