| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | Minor RelativeLinkFilter cleanuprs-relative-link-filter | Robert Speicher | 2015-05-13 | 2 | -17/+31 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'omniauth-csrf' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 1 | -0/+66 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793 | |||||
| | * | | | | | | Add reset_session for the :reset_session strategy. | Douwe Maan | 2015-04-24 | 1 | -1/+5 | |
| | | | | | | | | ||||||
| | * | | | | | | Protect OmniAuth request phase against CSRF. | Douwe Maan | 2015-04-24 | 1 | -0/+62 | |
| | | | | | | | | ||||||
| * | | | | | | | Use SIGKILL by default in Sidekiq::MemoryKiller | Jacob Vosmaer | 2015-05-13 | 1 | -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 Zaporozhets | 2015-05-13 | 5 | -50/+50 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1 | Douwe Maan | 2015-05-13 | 1 | -2/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | Improve OAuth signup error message. | Douwe Maan | 2015-05-13 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Improve description of branch protection levels. | Douwe Maan | 2015-05-13 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | Improve Git access error messages. | Douwe Maan | 2015-05-13 | 3 | -45/+44 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-05-13 | 3 | -5/+122 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge pull request #9276 from jirutka/relative_link_filter | Dmitriy Zaporozhets | 2015-05-13 | 3 | -5/+122 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Extract handling of relative file links to its own HTML filter | |||||
| | | * | | | | | | RelativeLinkFilter: refactor according to suggestions by @tsigo | Jakub Jirutka | 2015-05-11 | 2 | -17/+13 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Extract handling of relative file links to RelativeLinkFilter | Jakub Jirutka | 2015-05-11 | 3 | -5/+126 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'version-check' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version check See merge request !1509 | |||||
| | * | | | | | | | Replace host with real one | Dmitriy Zaporozhets | 2015-05-11 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | | | | | | Merge branch 'version-check' into gl-version-check | Dmitriy Zaporozhets | 2015-05-08 | 1 | -0/+19 | |
| | |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb | |||||
| | | * | | | | | | Remove unnecessary public key | Dmitriy Zaporozhets | 2015-05-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | | * | | | | | | Remove encryption | Dmitriy Zaporozhets | 2015-05-08 | 1 | -18/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | | * | | | | | | Add version check badge to admin area | Dmitriy Zaporozhets | 2015-03-09 | 1 | -0/+30 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'ad-block_auto_created_users' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638 | |||||
| | * | | | | | | | | Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_users | Douwe Maan | 2015-05-12 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'brakeman-level' | Dmitriy Zaporozhets | 2015-05-12 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tasks/brakeman.rake | |||||
| | * | | | | | | | | We would like to pass 'brakeman -w2' | Jacob Vosmaer | 2015-05-11 | 1 | -0/+2 | |
| | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Follow shell command guidelines in Brakeman task | Jacob Vosmaer | 2015-05-11 | 1 | -1/+1 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no real issue here because the shell command is completely static, but it is still nicer to just follow the guidelines in doc/development/shell_commands.md . | |||||
| * | | | | | | | Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-class | Robert Speicher | 2015-05-08 | 1 | -2/+17 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #9214 from Bugagazavr/hook-events | Valeriy Sizov | 2015-05-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Added X-GitLab-Event header for web hooks | |||||
| | * | | | | | | Added X-GitLab-Event header for web hooks | bugagazavr | 2015-05-08 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'rs-task_list' into 'master' | Dmitriy Zaporozhets | 2015-05-08 | 3 | -30/+20 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 changes | Robert Speicher | 2015-05-06 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Remove 'jasmine' gem | Robert Speicher | 2015-05-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jasmine-rails still requires it as a dependency, but for some reason running `rake jasmine:ci` produced test failures but `rake spec:javascript` didn't. | |||||
| | * | | | | | | | Remove all references to `parse_tasks` | Robert Speicher | 2015-05-06 | 1 | -28/+3 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Add TaskList::Filter to pipeline | Robert Speicher | 2015-05-06 | 1 | -4/+7 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-05-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Revert "Allow to configure smtp and sendmail in gitlab.yml" | Dmitriy Zaporozhets | 2015-05-06 | 1 | -1/+1 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var | Jacob Vosmaer | 2015-05-07 | 1 | -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.yml | Jakub Jirutka | 2015-05-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Update authentication.rb | quodos | 2015-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | correct spelling | |||||
| * | | | | | | Add current_sign_in_at to api User | Sven Selberg | 2015-05-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into ↵ | Dmitriy Zaporozhets | 2015-05-03 | 3 | -5/+18 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | jubianchi-api-iid | |||||
| | * | | | | | | Query issues, merge requests and milestones with their IID through API | jubianchi | 2015-05-02 | 3 | -5/+18 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #9066 from jirutka/fix-6417 | Dmitriy Zaporozhets | 2015-05-03 | 1 | -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 API | Robert Schilling | 2015-03-31 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #8756 from zaburt/force_utf8_on_oauth_properties | Dmitriy Zaporozhets | 2015-05-03 | 2 | -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 utf8 | Onur Küçük | 2015-05-03 | 2 | -7/+16 | |
| | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Remove title_for_issue helper | Robert Speicher | 2015-04-30 | 1 | -5/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove special handling for the `'` problem | Robert Speicher | 2015-04-30 | 2 | -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_issue | Robert Speicher | 2015-04-30 | 1 | -7/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Rename SCHEME_PATTERN to LINK_PATTERN | Robert Speicher | 2015-04-30 | 1 | -5/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Autolink short URLs | Robert Speicher | 2015-04-30 | 1 | -1/+4 | |
| | | | | | | | | | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |