summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-081-1/+1
|\ \ \ \ \
| * | | | | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-061-1/+1
| |/ / / /
* | | | | 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.
* | | | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-061-1/+1
| | | |
* | | | Update authentication.rbquodos2015-05-041-1/+1
| | | | | | | | | | | | correct spelling
* | | | Add current_sign_in_at to api UserSven Selberg2015-05-041-1/+1
| | | |
* | | | Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into ↵Dmitriy Zaporozhets2015-05-033-5/+18
|\ \ \ \ | | | | | | | | | | | | | | | jubianchi-api-iid
| * | | | Query issues, merge requests and milestones with their IID through APIjubianchi2015-05-023-5/+18
| | | | |
* | | | | Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets2015-05-031-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix #6417: users with group permission should be able to create groups via API
| * | | | | Fix #6417: users with group permission should be able to create groups via APIRobert Schilling2015-03-311-2/+2
| | | | | |
* | | | | | 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-302-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
* | | | | | Escape normal text in our Redcarpet rendererRobert Speicher2015-04-301-1/+3
| | | | | |
* | | | | | 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-303-14/+103
| | | | | |
* | | | | | Add Gitlab::Markdown::TableOfContentsFilterRobert Speicher2015-04-303-10/+67
| | | | | | | | | | | | | | | | | | | | | | | | Removes header and table of contents processing from Redcarpet renderer.
* | | | | | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-301-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show incompatible projects in Google Code import status Using Google Code import with a JSON file that contained only one Subversion project led to confusion over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion. Closes #1531 ## Screenshots Before: ![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png) After with no projects available (notice the button is hidden): ![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png) After with 1 valid and 1 incompatible project: ![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png) See merge request !586
| * | | | | 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
* | | | | | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-2/+2
|/ / / / /
* | | | | Merge pull request #8677 from jubianchi/api-500-jsonJeroen van Baarsen2015-04-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Send 500 errors as JSON in the API
| * | | | | Send 500 errors as JSON in the APIjubianchi2015-04-271-1/+1
| | | | | |
* | | | | | Add a rake task to automatically restart foreman when changes occurjubianchi2015-04-271-0/+5
|/ / / / /
* | | | | Merge pull request #8754 from jirutka/fix-project_name_regexJeroen van Baarsen2015-04-271-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix (project_)name_regex to accept non-ASCII letters and dash
| * | | | | Fix (project_)name_regex to accept non-ASCII letters and dashJakub Jirutka2015-04-271-4/+4
| | | | | |
* | | | | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-1/+1
|/ / / / / | | | | | | | | | | | | | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* | | | | 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