summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Precompiling JalaliDatePicker assetsrtl-7.4.2.1Sacred Seven2014-10-274-10/+7
* Fixed milestone Expired_at renderingSacred Seven2014-10-274-6/+6
* JalaliCalendar in broadcast messagesrtl-7.4.2Sacred Seven2014-10-262-6/+42
* Jalali Calendar in milestone pages fixedSacred Seven2014-10-264-11/+19
* All times displayed in the project are converted to JalaliDate, the only know...Sacred Seven2014-10-2612-32/+27
* Jalali tooltipsSacred Seven2014-10-251-1/+1
* Changed fonts to TahomaSacred Seven2014-10-251-0/+4
* merged v7.4.2Sacred Seven2014-10-25330-1716/+2608
|\
| * internal snippets: fix exposing of titleValery Sizov2014-10-241-0/+2
| * fix for public snippetValery Sizov2014-10-241-1/+1
| * Merge branch 'fix-500-login-disabled' into 'master'Marin Jankovski2014-10-221-10/+10
| * Use allowed slack team name.Marin Jankovski2014-10-211-1/+2
| * Use :message key, not :error for File::Service.Ciro Santilli2014-10-213-8/+2
| * Add tests for remove group member feature in admin areaDmitriy Zaporozhets2014-10-202-1/+2
| * Fix group user removal from admin areaDmitriy Zaporozhets2014-10-201-1/+1
| * Refactor error message a bitDmitriy Zaporozhets2014-10-171-2/+10
| * Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-161-8/+5
| * Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
| * Show merge in progress message if MR is lockedDmitriy Zaporozhets2014-10-152-1/+7
| * Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-151-1/+1
| |\
| | * Merge pull request #8048 from skv-headless/masterDmitriy Zaporozhets2014-10-151-1/+1
| | |\
| | | * same rendering for note diff as for usual diffEvgeniy Sokovikov2014-10-151-1/+1
| * | | Add links to the migration doc, make it clear import is only for git repos.Marin Jankovski2014-10-152-2/+4
| |/ /
| * | Merge branch 'fix-star-icon' into 'master'Dmitriy Zaporozhets2014-10-152-1/+2
| |\ \
| | * | Use stars icon on explore->starred pageDmitriy Zaporozhets2014-10-142-1/+2
| * | | Merge branch 'improve-mr-widgets' into 'master'Dmitriy Zaporozhets2014-10-152-11/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Move "modify merge message link" to the right to prevent accidently hiting ac...Dmitriy Zaporozhets2014-10-141-9/+8
| | * | Make accept MR widget looks similar to panelsDmitriy Zaporozhets2014-10-141-2/+4
| | |/
| * | Merge branch 'feature-multiple-ldap-servers' into 'master'Dmitriy Zaporozhets2014-10-146-14/+18
| |\ \ | | |/ | |/|
| | * Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-142-4/+4
| | * Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-141-4/+0
| | * Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-serversJan-Willem van der Meer2014-10-134-11/+42
| | |\
| | * | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-136-33/+36
| | * | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-132-9/+58
| | |\ \
| * | | | Different wording for notification note.Marin Jankovski2014-10-141-3/+3
| * | | | Add a note about notification for a project.Marin Jankovski2014-10-141-4/+8
| * | | | Merge pull request #7942 from cirosantilli/commit-changes-uppercaseDmitriy Zaporozhets2014-10-133-18/+17
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Make new and edit file submit more uniformCiro Santilli2014-10-083-18/+17
| * | | | Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-134-11/+42
| |\ \ \ \
| | * | | | Admin: user sortingValery Sizov2014-10-134-11/+42
| * | | | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-131-20/+15
| |\ \ \ \ \
| | * | | | | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-101-20/+15
| | |/ / / /
| * | | | | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-132-9/+58
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Improve dashboard note view and add testsVinnie Okada2014-10-122-11/+26
| | * | | Preserve link href in truncated note viewVinnie Okada2014-10-122-7/+41
| * | | | Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-1215-15/+37
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Dontr decoarate already decorated stuffDmitriy Zaporozhets2014-10-101-1/+7
| | * | | Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-104-4/+10
| | * | | Dont raise exception when wrong commit id passedDmitriy Zaporozhets2014-10-101-0/+2
| | * | | Use full commit sha width for reference in note body to prevent Ambiguous SHA...Dmitriy Zaporozhets2014-10-101-1/+1