summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'rs-refactor-reference-extractor' into 'master'Robert Speicher2015-04-2521-257/+464
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ReferenceExtractor See merge request !557
| | * | | | | | | | | | Fix NotificationService specRobert Speicher2015-04-253-7/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractorRobert Speicher2015-04-251-4/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-252-17/+15
| | | | | | | | | | | |
| | * | | | | | | | | | Add CommitRange directly to results HashRobert Speicher2015-04-252-5/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Remove CommitRange#to_aRobert Speicher2015-04-252-40/+0
| | | | | | | | | | | |
| | * | | | | | | | | | DRY up ReferenceExtractorRobert Speicher2015-04-251-9/+11
| | | | | | | | | | | |
| | * | | | | | | | | | Don't allow nil references to get added to resultsRobert Speicher2015-04-251-0/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Include caret in CommitRange#reference_titleRobert Speicher2015-04-252-2/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Remove param from CommitRange#to_sRobert Speicher2015-04-252-22/+6
| | | | | | | | | | | |
| | * | | | | | | | | | CommitRange improvementsRobert Speicher2015-04-252-16/+13
| | | | | | | | | | | |
| | * | | | | | | | | | Update CommitRangeReferenceFilter to use CommitRange classRobert Speicher2015-04-252-37/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also matches CommitReferenceFilter's new behavior of always using short SHAs in the link text.
| | * | | | | | | | | | Add CommitRange classRobert Speicher2015-04-252-0/+283
| | | | | | | | | | | |
| | * | | | | | | | | | Always use short SHAs as commit reference link textRobert Speicher2015-04-252-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now when a user pastes a full SHA like `d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show `d7f61aff` for brevity.
| | * | | | | | | | | | Add to_param to mentionable spec's mockRobert Speicher2015-04-251-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Refactor ReferenceExtractor to use pipeline filtersRobert Speicher2015-04-252-193/+36
| | | | | | | | | | | |
| | * | | | | | | | | | Add results to reference filtersRobert Speicher2015-04-2514-18/+129
| | | | | | | | | | | |
| | * | | | | | | | | | Add `pipeline_result` to ReferenceFilterSpecHelperRobert Speicher2015-04-251-0/+14
| | | | | | | | | | | |
| | * | | | | | | | | | Initialize the references result Hash in ReferenceFilterRobert Speicher2015-04-251-0/+16
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-2717-32/+68
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-2710-21/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add X-GitLab-Event header for web hooks
| | * | | | | | | | | | | Added X-GitLab-Event header for web hooksbugagazavr2015-04-2510-21/+32
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #9186 from Senorsen/patch-1Dmitriy Zaporozhets2015-04-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix contributions calendar empty problem under mysql
| | * | | | | | | | | | | | Fix contributions calendar empty problem under mysqlZhang Sen2015-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using MySQL as database backend in GitLab, ``date`` in ``date(created_at), count(id) as total_amount`` won't return the ``date`` column (should be ``date(created_at)``), as a result, there's no contribution in the user profile page. Adding an ``as date`` can solve this problem.
| * | | | | | | | | | | | | Merge pull request #9213 from bbodenmiller/patch-1Robert Schilling2015-04-271-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google -> Google
| | * | | | | | | | | | | | | google -> GoogleBen Bodenmiller2015-04-261-4/+4
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #9206 from dsander/hipchat-optionsJeroen van Baarsen2015-04-264-3/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | Add notify and color options to HipchatService
| | * | | | | | | | | | | | Add notify and color options to HipchatServiceDominik Sander2015-04-264-3/+27
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When notify is set to true send messages will trigger a notification for all room members. Color changes the background color of the message.
| * | | | | | | | | | | | Merge pull request #9200 from jvanbaarsen/version-10Robert Schilling2015-04-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | Version 7.10.0 has been released so its 7.11.0-pre time
| | * | | | | | | | | | | Its 7.11.0-pre timeJeroen van Baarsen2015-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | | | | | | | | | | | Merge pull request #9196 from tonicbupt/fixJeroen van Baarsen2015-04-251-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix redis 3.0.0
| | * | | | | | | | | | | | fix redis 3.0.0tonic2015-04-251-1/+2
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #9189 from rockneverdies55/patch-1Robert Schilling2015-04-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | Removed "unreleased" from v7.10 changelog
| | * | | | | | | | | | | Removed "unreleased" from v7.10 changelogrockneverdies552015-04-241-1/+1
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Version 7.10 is already released so "unreleased" text next to it in the changelog file can be removed.
* | | | | | | | | | | | Merge branch 'snippet-default-visibility' into 'master'Dmitriy Zaporozhets2015-04-2721-67/+167
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new admin settings Add new settings to the admin web UI for default project and snippet visibility levels. See #2027. ### New settings: ![default_visibility_settings](https://dev.gitlab.org/gitlab/gitlabhq/uploads/bd6d296e39ea3c90ca6a5254b8eb1fef/default_visibility_settings.png) See merge request !1795
| * | | | | | | | | | | Add new admin settingsVinnie Okada2015-04-2621-67/+167
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new global application settings for default project and snippet visibility levels.
* | | | | | | | | | | Merge branch 'fix-slack-channel-in-admin-settings' into 'master'Douwe Maan2015-04-245-22/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where Slack service channel was not saved in admin template settings Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181 Closes #1501 See merge request !574
| * | | | | | | | | | | Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-245-22/+26
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181
* | | | | | | | | | | Merge branch 'rs-simplify-uploads-controller' into 'master'Robert Speicher2015-04-241-5/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the `skip_before_action` logic for UploadsController See merge request !547
| * | | | | | | | | | Simplify the `skip_before_filter` logic for UploadsControllerrs-simplify-uploads-controllerRobert Speicher2015-04-231-5/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-245-32/+68
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mobile-ui-improvements' into 'master'Dmitriy Zaporozhets2015-04-245-32/+68
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mobile UI for dashboard and project pages Some love for mobile UI :smiley: ## Before - - - ![Screenshot_2015-04-24-17-42-59](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/827f9cefa477fc7f0d1b2d56e479a35c/Screenshot_2015-04-24-17-42-59.png) ![Screenshot_2015-04-24-17-27-01](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/698eb90033d40ea7de9f599364a34d0e/Screenshot_2015-04-24-17-27-01.png) ## After - - - ![Screenshot_2015-04-24-17-16-08](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/7e3ad8bc18800f63a7be20ea31ccfd3b/Screenshot_2015-04-24-17-16-08.png) ![Screenshot_2015-04-24-17-39-18](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/cde3379836530d95e94922ba5c200cef/Screenshot_2015-04-24-17-39-18.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !573
| | * | | | | | | | | | Improve mobile UI for dashboard and project pagesDmitriy Zaporozhets2015-04-245-32/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | Merge branch 'username-period-again' into 'master'Douwe Maan2015-04-245-4/+102
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow username to end in period. Fixes #2174 and #2249. cc @jacobvosmaer Please review and test with the GitLab.com dump. See merge request !1786
| * | | | | | | | | | | Revert "Rename namespace_regex to namespace_path_regex."Douwe Maan2015-04-247-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c0116926c743818b2593474946abb40b56d8fefa.
| * | | | | | | | | | | Explain namespace clearn regex.Douwe Maan2015-04-242-0/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Update schema.Douwe Maan2015-04-241-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Don't attempt to move if original path only contains periods.Douwe Maan2015-04-241-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Change migration timestamp.Douwe Maan2015-04-241-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Properly migrate users with usernames like "." or "..".Douwe Maan2015-04-242-1/+9
| | | | | | | | | | | |