summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Blacklist 'new'blacklist-newRobert Schilling2016-01-081-0/+1
|
* Merge branch 'give-credit-to-kaiser-soze' into 'master' Stan Hu2016-01-081-1/+1
|\ | | | | | | | | | | | | Give credit to user who created find file feature [ci skip] See merge request !2342
| * Give credit to user who created find file featuregive-credit-to-kaiser-sozeStan Hu2016-01-071-1/+1
|/ | | | [ci skip]
* Merge branch 'task-list-class' into 'master' Robert Speicher2016-01-072-4/+10
|\ | | | | | | | | | | | | Properly set task-list class on single item task lists Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4193 See merge request !2330
| * Merge branch 'master' into task-list-classtask-list-classDouwe Maan2016-01-077-13/+27
| |\
| * | Properly set task-list class on single item task listsDouwe Maan2016-01-072-4/+10
| | |
* | | Merge branch 'gemfile-lock' into 'master' Robert Speicher2016-01-070-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Gemfile.lock My Bundler didn't agree with the previous order. See merge request !2331
| * | | Update Gemfile.lockgemfile-lockDouwe Maan2016-01-071-5/+5
| |/ /
* | | Merge branch 'milestone-ref' into 'master' Robert Speicher2016-01-0713-22/+172
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Link to milestone in "Milestone changed" system note Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4141 See merge request !2203
| * | | Milestone reference is a Markdown linkmilestone-refDouwe Maan2016-01-073-3/+8
| | | |
| * | | Fix changelogDouwe Maan2016-01-071-1/+0
| | | |
| * | | Merge branch 'master' into milestone-refDouwe Maan2016-01-0615-60/+251
| |\ \ \
| * | | | Remove icon from milestone reference.Douwe Maan2016-01-054-6/+5
| | | | |
| * | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-05183-1616/+3543
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-2530-58/+455
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-2477-382/+1261
| |\ \ \ \ \ \
| * | | | | | | More escaping!Douwe Maan2015-12-242-5/+5
| | | | | | | |
| * | | | | | | Use `to_reference` in system notes.Douwe Maan2015-12-241-1/+1
| | | | | | | |
| * | | | | | | Add changelog itemDouwe Maan2015-12-241-0/+1
| | | | | | | |
| * | | | | | | Link to milestone in "Milestone changed" system noteDouwe Maan2015-12-243-5/+4
| | | | | | | |
| * | | | | | | Render milestone links as referencesDouwe Maan2015-12-2410-18/+164
| | | | | | | |
| * | | | | | | Escape reference link textDouwe Maan2015-12-242-8/+11
| | | | | | | |
* | | | | | | | Merge branch 'annotate-models-20160105' into 'master' Dmitriy Zaporozhets2016-01-0757-254/+350
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotate models Time to refresh the comments via `annotate`. See merge request !2311
| * | | | | | | | Annotate modelsStan Hu2016-01-0657-254/+350
| | | | | | | | |
* | | | | | | | | Merge branch 'ajax-issues-fix' into 'master' Dmitriy Zaporozhets2016-01-072-22/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes ajax issue with issue spec See merge request !2333
| * | | | | | | | | fixes ajax issue with issue specajax-issues-fixJacob Schatz2016-01-072-22/+22
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ajax-filter-commits' into 'master' Dmitriy Zaporozhets2016-01-079-70/+87
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ajax filter commits Fixes #3509 ![Screenshot_2016-01-06_13.07.53](/uploads/7400d855d8207e37e3c0ec09cb2265e9/Screenshot_2016-01-06_13.07.53.png) See merge request !2314
| * | | | | | | | Use fadeTo instead of cssajax-filter-commitsDmitriy Zaporozhets2016-01-071-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Fix typo in js method and some repeating cssDmitriy Zaporozhets2016-01-073-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add support for ref and path to commits filteringDmitriy Zaporozhets2016-01-073-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Prevent loading first 20 commits twiceDmitriy Zaporozhets2016-01-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add CHANGELOG item and testsDmitriy Zaporozhets2016-01-073-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add ajax filtering for commits listDmitriy Zaporozhets2016-01-072-46/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also handle commits list with Pager class to prevent code duplication Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add search field to commits pageDmitriy Zaporozhets2016-01-072-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Filter commits by search parameterDmitriy Zaporozhets2016-01-071-2/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'remove-more-influxdb-tags' into 'master' Yorick Peterse2016-01-074-10/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | See merge request !2328
| * | | | | | | | Store request methods/URIs as valuesYorick Peterse2016-01-074-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since filtering by these values is very rare (they're mostly just displayed as-is) we don't need to waste any index space by saving them as tags. By storing them as values we also greatly reduce the number of series in InfluxDB.
| * | | | | | | | Removed UUIDs from metrics transactionsYorick Peterse2016-01-072-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While useful for finding out what methods/views belong to a transaction this might result in too much data being stored in InfluxDB.
* | | | | | | | | Merge branch 'find-file-credit' into 'master' Douwe Maan2016-01-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Credit koreamic for creating Find File See merge request !2327
| * | | | | | | | | Credit koreamic for creating Find FileDouwe Maan2016-01-071-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master' Dmitriy Zaporozhets2016-01-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest prefacing find command with sudo when base permissions are wrong Closes #5872 See merge request !2299
| * | | | | | | | | Suggest prefacing find command with sudo when base permissions are wrongStan Hu2016-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5872
* | | | | | | | | | Merge branch 'fix-missing-day-in-network-graph' into 'master' Dmitriy Zaporozhets2016-01-072-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing date of month in network graph when commits span a month Closes #3635, #1383 Before: ![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png) After: ![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png) See merge request !2325
| * | | | | | | | | Fix missing date of month in network graph when commits span a monthStan Hu2016-01-062-1/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes #3635, #1383
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-070-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #9889 from koreamic/file_finderDouwe Maan2016-01-0725-9/+473
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add new feature to find file(recreate)
| | * | | | | | | | | Add new feature to find filekoreamic2016-01-0725-9/+473
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the fuzzy filter, develop "file finder" feature. - feedback(http://feedback.gitlab.com/forums/176466-general/suggestions/4987909-add-file-finder-fuzzy-input-in-files-tab-to-ju ) - fuzzy filter(https://github.com/jeancroy/fuzzaldrin-plus) - shortcuts(when "t" was hitted at tree view, go to 'file find' page and 'esc' is to go back) - depends on gitlab_git 7.2.22
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-0725-9/+473
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'revert-influxdb-milliseconds' into 'master' Yorick Peterse2016-01-074-14/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | See merge request !2326
| * | | | | | | | | Revert "Store SQL/view timings in milliseconds"Yorick Peterse2016-01-074-14/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7549102bb727daecc51da84af39956b32fc41537. Apparently I was wrong about ActiveSupport::Notifications::Event#duration returning the duration in seconds, instead it returns it in milliseconds already.