summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-067-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #11853
* | | | | | | | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
| * | | | | | | | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
* | | | | | | | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-092-23/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Faster snippet searchValery Sizov2016-02-052-23/+27
| | | | | | | | | |
* | | | | | | | | | Merge branch 'caching-repository-git-operations' into 'master' Yorick Peterse2016-02-093-3/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | See merge request !2752
| * | | | | | | | | | Cache various Repository Git operationscaching-repository-git-operationsYorick Peterse2016-02-083-3/+25
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caches the output of the following methods: * Repository#empty? * Repository#has_visible_content? * Repository#root_ref The cache for Repository#has_visible_content? is flushed whenever a commit is pushed to a new branch or an existing branch is removed. The cache for Repository#root_ref is only flushed whenever a user changes the default branch of a project. The cache for Repository#empty? is never explicitly flushed as there's no need for it.
* | | | | | | | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable2016-02-083-0/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember user's inline/tabular diff view preference in a cookie _Originally opened at !1677 by @kkm._ --- As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie. Fixes #3071. See merge request !2723
| * | | | | | | | | Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-051-3/+1
| | | | | | | | | |
| * | | | | | | | | Remember user's inline/tabular diff view preference in a cookiekkm2016-02-053-0/+11
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'project-title-dropdown-toggle-button' into 'master' Jacob Schatz2016-02-052-2/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the project switcher dropdown toggle Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214 cc. @jschatz1 @dzaporozhets See merge request !2733
| * | | | | | | | | Uses icon helper for dropdown toggle iconPhil Hughes2016-02-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Changed the project switcher dropdown togglePhil Hughes2016-02-052-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* | | | | | | | | | Merge branch 'improve-diverging-commit-counts' into 'master' Robert Speicher2016-02-051-2/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dedicated method for counting commits between refs Corresponding gitlab_git merge request: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/66 Issue that lead to these changes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12619 See merge request !2707
| * | | | | | | | | Dedicated method for counting commits between refsimprove-diverging-commit-countsYorick Peterse2016-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab_git 8.1 adds the ability to count the amount of commits between two references without having to allocate anything but regular Rugged::Commit objects. This in turn speeds up the process of counting the number of commits a branch is ahead/behind by about 3.5x.
* | | | | | | | | | Merge branch 'feature/jschatz1/sidebar-features' into 'master' Dmitriy Zaporozhets2016-02-053-4/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/jschatz1/sidebar features * Changes sidebar width (290px). * Makes shortcuts for <kbd>j</kbd> and <kbd>k</kbd> keys for next and previous issues. ![Screen_Shot_2016-02-05_at_3.06.22_PM](/uploads/8590be43dc1b9feffd4f32b4e8cb7790/Screen_Shot_2016-02-05_at_3.06.22_PM.png) cc/ @dzaporozhets See merge request !2734
| * | | | | | | | | | Changes sidebar widthfeature/jschatz1/sidebar-featuresJacob Schatz2016-02-051-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Add `j` and `k` shortcutsJacob Schatz2016-02-052-2/+21
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bug/jschatz1/sidebar-issues' into 'master' Dmitriy Zaporozhets2016-02-051-2/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff and commit view on merge requests with new sidebar Fixes #3981 See merge request !2718
| * | | | | | | | | | Fix diff and commit view on merge requestsbug/jschatz1/sidebar-issuesJacob Schatz2016-02-041-2/+4
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with new sidebar Fixes #3981
* | | | | | | | | | Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'Robert Speicher2016-02-054-3/+23
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for issue with poor logo transition animation on Safari See merge request !2690
| * | | | | | | | | fixed issue with poor logo transition animation on safariRoman Rott2016-02-054-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors Updated comments and Changelog Removed duplicate line in changelog
* | | | | | | | | | Improve placeholder: search -> SearchDmitriy Zaporozhets2016-02-051-1/+1
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Add JS style changes.feature/jschatz1/issuable-date-positioningJacob Schatz2016-02-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @rspeicher
* | | | | | | | | Edited time ago location change.Jacob Schatz2016-02-055-50/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change edited icon to word. Change edited text color to gray cc/ @creamzy
* | | | | | | | | Merge branch 'fix-double-page' into 'master' Dmitriy Zaporozhets2016-02-053-3/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double paging ![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png) ![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png) See merge request !2727
| * | | | | | | | | Fix double pagingJosh Frye2016-02-053-3/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'improve-broadcast-messages' into 'master' Dmitriy Zaporozhets2016-02-052-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve admin broadcast messages page * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13211 cc @rspeicher @DouweM See merge request !2725
| * | | | | | | | Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'paginate-dashboard-projects' into 'master' Dmitriy Zaporozhets2016-02-0515-33/+91
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Page project list on dashboard See merge request !2689
| * | | | | | | | Frontend changes from MR feedbackpaginate-dashboard-projectsJosh Frye2016-02-051-3/+4
| | | | | | | | |
| * | | | | | | | Fix project filter form renderingDmitriy Zaporozhets2016-02-052-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Implement changes from MR feedbackJosh Frye2016-02-045-16/+16
| | | | | | | | |
| * | | | | | | | Remove js lineJosh Frye2016-02-041-1/+0
| | | | | | | | |
| * | | | | | | | Various filter fixesJosh Frye2016-02-0418-62/+90
| | | | | | | | |
| * | | | | | | | Delay filter until user stops typingJosh Frye2016-02-046-26/+33
| | | | | | | | |
| * | | | | | | | Paginate + ajax filter dashboard projectsJosh Frye2016-02-0410-46/+67
| | | | | | | | |
| * | | | | | | | Page project list on dashboardJosh Frye2016-02-041-0/+2
| | | | | | | | |
* | | | | | | | | Remove project-issuable-filter from admin builds page :)improve-nav-controlsDmitriy Zaporozhets2016-02-052-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Re-use top-are css component for issues/mr pagesDmitriy Zaporozhets2016-02-059-80/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Add support for inline form in nav-controls componentDmitriy Zaporozhets2016-02-051-0/+4
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'list-padding' into 'master' Dmitriy Zaporozhets2016-02-0510-26/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New padding for lists * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #12511 cc @jschatz1 @skyruler @creamzy See merge request !2715
| * | | | | | | | New padding for listslist-paddingDmitriy Zaporozhets2016-02-0410-26/+15
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'rymai/gitlab-ce-3007-fix-mr-label-links' into 'master' Rémy Coutable2016-02-053-6/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label links for a merge request pointing to issues list _Originally opened at !2150._ --- I have added a type parameter to the `link_to_label` helper method that is set to `'merge_request'` when in the context of a merge request. I have also improved the specs to actually test the output of the method instead of its implementation. Fixes #3007. See merge request !2700
| * | | | | | | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-043-6/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
* | | | | | | Merge branch 'search-on-groups-is-ugly' into 'master' Dmitriy Zaporozhets2016-02-042-13/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change placeholder text to just 'search' Fixes #13168 ![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png) See merge request !2711
| * | | | | | Change placeholder text to just 'search'search-on-groups-is-uglyJacob Schatz2016-02-042-13/+1
| |/ / / / /
* | | | | | Merge branch 'fuzzy-file-search-menu-shortcut-placement' into 'master' Dmitriy Zaporozhets2016-02-041-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puts shortcut key in the right place. Fixes #13192 ![Screen_Shot_2016-02-04_at_11.51.15_AM](/uploads/a10dc24b4a836199351ba98fca266695/Screen_Shot_2016-02-04_at_11.51.15_AM.png) See merge request !2710
| * | | | | | Puts shortcut key in the right place.fuzzy-file-search-menu-shortcut-placementJacob Schatz2016-02-041-4/+4
| | | | | | |
* | | | | | | Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' Dmitriy Zaporozhets2016-02-0418-115/+463
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new design for issue and merge request right sidebar Fixes #3981 See merge request !2645