summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* Use slightly fewer icons in project sidebar.Douwe Maan2015-05-141-6/+0
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-145-32/+32
|\
| * Merge branch 'fix-group-mention' into 'master'Dmitriy Zaporozhets2015-05-142-3/+3
| |\
| | * Fix mentioning of private groups.Douwe Maan2015-05-142-3/+3
| * | Always show note action icons.Douwe Maan2015-05-143-29/+29
| |/
* | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-142-3/+3
|\ \ | |/ |/|
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-242-3/+3
* | Fix text overflow in project sidebarDmitriy Zaporozhets2015-05-131-0/+4
* | Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-131-2/+9
|\ \
| * | Improve OAuth signup error message.Douwe Maan2015-05-131-2/+9
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-132-140/+15
|\ \ \
| * \ \ Merge pull request #9276 from jirutka/relative_link_filterDmitriy Zaporozhets2015-05-131-140/+0
| |\ \ \
| | * | | Extract handling of relative file links to RelativeLinkFilterJakub Jirutka2015-05-111-140/+0
| * | | | Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commitJeroen van Baarsen2015-05-131-0/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Call merge request web hook for each commitsArthur Gautier2015-05-131-0/+15
* | | | | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-135-1/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable version check only for production environmentDmitriy Zaporozhets2015-05-111-1/+3
| * | | | Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| * | | | Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-085-1/+20
| |\ \ \ \
| | * | | | Remove encryptionDmitriy Zaporozhets2015-05-081-3/+1
| | * | | | Add feature to disable version checkDmitriy Zaporozhets2015-03-104-4/+13
| | * | | | Add version check to help page tooDmitriy Zaporozhets2015-03-091-0/+1
| | * | | | Prevent crash if file does not existsDmitriy Zaporozhets2015-03-091-1/+3
| | * | | | Add version check badge to admin areaDmitriy Zaporozhets2015-03-092-1/+10
* | | | | | Merge branch 'fix-avatar-removal' into 'master'Hannes Rosenögger2015-05-123-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix bug where avatar filenames were not actually deleted from the database du...Stan Hu2015-05-073-4/+4
* | | | | | Merge branch 'note-role' into 'master'Dmitriy Zaporozhets2015-05-122-9/+28
|\ \ \ \ \ \
| * | | | | | Show user roles by comments.Douwe Maan2015-05-122-9/+28
* | | | | | | Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets2015-05-128-235/+330
|\ \ \ \ \ \ \
| * | | | | | | Refactor SystemNoteService.cross_reference_disallowed?Robert Speicher2015-05-111-6/+13
| * | | | | | | Check if `system` is truthy in `Note.cross_reference?`Robert Speicher2015-05-111-1/+1
| * | | | | | | Update SystemNoteService method naming conventionsRobert Speicher2015-05-116-77/+73
| * | | | | | | Remove legacy special case for emphasized reference notesRobert Speicher2015-05-111-13/+9
| * | | | | | | Add a SystemNoteService classRobert Speicher2015-05-118-218/+320
| * | | | | | | Simplify `Note#upvote?` and `Note#downvote?`Robert Speicher2015-05-101-17/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'project-page' into 'master'Dmitriy Zaporozhets2015-05-128-81/+94
|\ \ \ \ \ \ \
| * | | | | | | Move "Forked from" above "Version".project-pageDouwe Maan2015-05-121-8/+9
| * | | | | | | Move clone panel to bottom of project sidebar.Douwe Maan2015-05-121-3/+3
| * | | | | | | Restructure project sidebar.Douwe Maan2015-05-122-65/+81
| * | | | | | | Fix alignment of ref picker, breadcrumb and buttons.Douwe Maan2015-05-124-14/+3
| * | | | | | | Add icons to more tabs.Douwe Maan2015-05-122-1/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-1212-8/+222
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Handle password reset for users with 2FA enabled2faRobert Speicher2015-05-111-0/+21
| * | | | | | Remove extra `devise` call that got added by accidentRobert Speicher2015-05-101-3/+0
| * | | | | | Remove unnecessary User#login accessor overrideRobert Speicher2015-05-091-5/+0
| * | | | | | Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-091-2/+7
| * | | | | | Prevent "You are already signed in." error message upon 2FA loginRobert Speicher2015-05-091-2/+8