summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
| * Minor RelativeLinkFilter cleanuprs-relative-link-filterRobert Speicher2015-05-132-17/+31
| |
* | Use SIGKILL by default in Sidekiq::MemoryKillerJacob Vosmaer2015-05-131-1/+1
|/ | | | | | | This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM.
* Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-134-31/+43
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642
| * Fix GitAccess.text-batch-1Douwe Maan2015-05-131-2/+3
| |
| * Improve OAuth signup error message.Douwe Maan2015-05-131-2/+2
| |
| * Improve description of branch protection levels.Douwe Maan2015-05-131-3/+3
| |
| * Improve Git access error messages.Douwe Maan2015-05-132-26/+37
| |
* | Merge pull request #9276 from jirutka/relative_link_filterDmitriy Zaporozhets2015-05-132-1/+122
|\ \ | |/ |/| Extract handling of relative file links to its own HTML filter
| * RelativeLinkFilter: refactor according to suggestions by @tsigoJakub Jirutka2015-05-112-17/+13
| |
| * Extract handling of relative file links to RelativeLinkFilterJakub Jirutka2015-05-112-1/+126
| |
* | Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_usersDouwe Maan2015-05-121-1/+1
|/
* Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-081-2/+17
|
* Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-082-30/+8
|\ | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
| * Update Markdown help docs for latest changesRobert Speicher2015-05-061-1/+1
| |
| * Remove all references to `parse_tasks`Robert Speicher2015-05-061-28/+3
| |
| * Add TaskList::Filter to pipelineRobert Speicher2015-05-061-4/+7
| |
* | Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env varJacob Vosmaer2015-05-071-5/+6
|/ | | | | | | It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com.
* Update authentication.rbquodos2015-05-041-1/+1
| | | correct spelling
* Merge pull request #8756 from zaburt/force_utf8_on_oauth_propertiesDmitriy Zaporozhets2015-05-032-7/+16
|\ | | | | add common method to force utf8 and force oauth properties to be utf8
| * add common method to force utf8 and force oauth properties to be utf8Onur Küçük2015-05-032-7/+16
| |
* | Remove title_for_issue helperRobert Speicher2015-04-301-5/+1
| |
* | Remove special handling for the `'` problemRobert Speicher2015-04-301-1/+0
| | | | | | | | | | | | While `escape_once` will create this HTML entity, Nokogiri always translates it back before it gets to IssueReferenceFilter, so there should be no danger of erroneous issue links.
* | Add Project#get_issueRobert Speicher2015-04-301-7/+6
| |
* | Rename SCHEME_PATTERN to LINK_PATTERNRobert Speicher2015-04-301-5/+5
| |
* | Autolink short URLsRobert Speicher2015-04-301-1/+4
| |
* | Update Autolink SCHEME_PATTERNRobert Speicher2015-04-301-1/+3
| |
* | Doc typoRobert Speicher2015-04-301-1/+1
| |
* | Update the Gitlab::Markdown docsRobert Speicher2015-04-301-25/+1
| |
* | Add Gitlab::Markdown::SanitizationFilterRobert Speicher2015-04-302-31/+41
| | | | | | | | | | This just extends the HTML::Pipeline::SanitizationFilter with our custom whitelist.
* | Add Gitlab::Markdown::AutolinkFilterRobert Speicher2015-04-302-1/+98
| |
* | Add Gitlab::Markdown::TableOfContentsFilterRobert Speicher2015-04-302-0/+67
| | | | | | | | Removes header and table of contents processing from Redcarpet renderer.
* | Show incompatible projects in Google Code import statusStan Hu2015-04-301-0/+4
|/ | | | | | | | Importing a JSON file with only one Subversion project lead to confusion over whether the system was working. Provide status why these projects could not be imported directly. Closes #1531
* Fix (project_)name_regex to accept non-ASCII letters and dashJakub Jirutka2015-04-271-4/+4
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-2711-197/+148
|\
| * Merge branch 'fix-gitorious-importer' into 'master'Dmitriy Zaporozhets2015-04-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Get Gitorious importer to work again. Fixes #1504. See merge request !576
| | * Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-241-1/+1
| | |
| * | Merge branch 'rs-minor-styles' into 'master'Dmitriy Zaporozhets2015-04-271-14/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor design change grab-bag :tada: I started with one simple change and found a few more, so here they are. ### Simplify icon style selectors All FontAwesome icons have an `fa` class, so just use that. ### Don't override color of code blocks in notes This was a pet peeve of mine. | Before | After | |:------:|:-----:| | ![Screen_Shot_2015-04-23_at_4.14.23_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c77cb0816bf0f05cb8c4105cdd8b3ec6/Screen_Shot_2015-04-23_at_4.14.23_PM.png) | ![Screen_Shot_2015-04-23_at_4.15.44_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/463c1d2052e12444563f5e2c102ac51e/Screen_Shot_2015-04-23_at_4.15.44_PM.png) | ### Items with tooltips don't need a 'data-original-title' attribute This attribute gets added dynamically by Bootstrap's tooltip JS based on the `title` attribute ### Fix Profile > Design live-updating `ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes. ### Remove the `has_bottom_tooltip` class Bootstrap's tooltip JS can read the placement from a `data-placement` attribute. Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method. See merge request !569
| | * | Fix Profile > Design live-updatingRobert Speicher2015-04-251-14/+25
| | |/ | | | | | | | | | | | | | | | | | | | | | `ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes.
| * | Convert UserReferenceFilter#link_to_group to use a guard clauseRobert Speicher2015-04-251-7/+5
| | |
| * | Refactor `UserReferenceFilter#user_link_filter`Robert Speicher2015-04-251-35/+43
| | |
| * | Fix docs for `push_result`Robert Speicher2015-04-251-2/+2
| | | | | | | | | | | | [ci skip]
| * | Fix NotificationService specRobert Speicher2015-04-252-5/+5
| | |
| * | Add CommitRange directly to results HashRobert Speicher2015-04-251-1/+1
| | |
| * | DRY up ReferenceExtractorRobert Speicher2015-04-251-9/+11
| | |
| * | Don't allow nil references to get added to resultsRobert Speicher2015-04-251-0/+2
| | |
| * | Update CommitRangeReferenceFilter to use CommitRange classRobert Speicher2015-04-251-33/+10
| | | | | | | | | | | | | | | Also matches CommitReferenceFilter's new behavior of always using short SHAs in the link text.
| * | Always use short SHAs as commit reference link textRobert Speicher2015-04-251-1/+1
| | | | | | | | | | | | | | | | | | Now when a user pastes a full SHA like `d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show `d7f61aff` for brevity.
| * | Refactor ReferenceExtractor to use pipeline filtersRobert Speicher2015-04-251-119/+36
| | |
| * | Add results to reference filtersRobert Speicher2015-04-257-2/+22
| | |
| * | Initialize the references result Hash in ReferenceFilterRobert Speicher2015-04-251-0/+16
| |/
View Lorry Controller Status