summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* remove unnecessary indexOf polyfillsremove-needless-bind-polyfillsMike Greiling2017-05-083-9/+6
|
* remove bind polyfill from mock_u2f_device.jsMike Greiling2017-05-081-4/+2
|
* remove bind polyfill from users/calendar.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from users_select.jsMike Greiling2017-05-081-4/+3
|
* remove bind polyfill from u2f/register.jsMike Greiling2017-05-081-10/+8
|
* remove bind polyfill from u2f/error.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from u2f/authenticate.jsMike Greiling2017-05-081-9/+7
|
* remove bind polyfill from single_file_diff.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from shortcuts.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from right_sidebar.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from project_new.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from project_find_file.jsMike Greiling2017-05-081-6/+4
|
* remove bind polyfill from notifications_form.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from notes.jsMike Greiling2017-05-081-20/+18
|
* remove bind polyfill from new_commit_form.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from new_branch_form.jsMike Greiling2017-05-081-3/+2
|
* remove bind polyfill from namespace_select.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from merge_request.jsMike Greiling2017-05-081-3/+1
|
* remove bind polyfill from line_highlighter.jsMike Greiling2017-05-081-5/+3
|
* remove bind polyfill from labels.jsMike Greiling2017-05-081-4/+2
|
* remove bind polyfill from issuable_form.jsMike Greiling2017-05-081-6/+4
|
* remove bind polyfill from stat_graph_contributors_graph.jsMike Greiling2017-05-081-2/+1
|
* remove bind polyfill from gl_dropdown.jsMike Greiling2017-05-081-5/+4
|
* remove bind polyfill from files_comment_button.jsMike Greiling2017-05-081-3/+2
|
* Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-081-0/+9
|\ | | | | | | | | | | | | Fix sub-second timing comparison error for Devise confirmation period Closes gitlab-ee#2362 See merge request !11156
| * Fix sub-second timing comparison error for Devise confirmation periodsh-fix-almost-there-spec-mysqlStan Hu2017-05-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | On databases such as MySQL, it's possible to get into a timing comparison error if the value of `Confirmable#confirmation_sent_at` is within a second of `0.days.ago`. This is possible mostly in specs that test this behavior and most likely not happening in practice. The result of this error causes a user to be deemed active when it should be inactive. To prevent this error, we explicitly check the configuration setting to be `0.days.ago`. Closes gitlab-org/gitlab-ee#2362
* | Merge branch 'update-templates-for-9-2' into 'master' Timothy Andrew2017-05-0811-1/+99
|\ \ | | | | | | | | | | | | Update gitignore, dockerfile, and license templates for 9.2 See merge request !11158
| * | Update gitignore, dockerfile, and license templates for 9.2.update-templates-for-9-2Timothy Andrew2017-05-0811-1/+99
| | |
* | | Merge branch 'document-foreign-keys' into 'master' Sean McGivern2017-05-083-0/+68
|\ \ \ | | | | | | | | | | | | | | | | Add documentation about adding foreign keys See merge request !11117
| * | | Add documentation about adding foreign keysYorick Peterse2017-05-083-0/+68
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'update-deps-licenses-for-9-2' into 'master' Timothy Andrew2017-05-081-139/+158
|\ \ \ | | | | | | | | | | | | | | | | Update the vendor licenses file for 9.2 See merge request !11159
| * | | Update the vendor licenses file for 9.2.update-deps-licenses-for-9-2Timothy Andrew2017-05-081-139/+158
| |/ /
* | | Merge branch 'lm-improve-HA-docs' into 'master' Sean Packham (GitLab)2017-05-082-10/+11
|\ \ \ | |/ / |/| | | | | | | | clarify DB/Redis HA docs See merge request !11094
| * | clarify DB/Redis HA docslm-improve-HA-docsLee Matos2017-05-042-10/+11
| | |
* | | Merge branch 'docs/new-topic-issues' into 'master' Sean Packham (GitLab)2017-05-0836-38/+426
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | New doc topic: issues Closes #27650 See merge request !11075
| * | | New doc topic: issuesMarcia Ramos2017-05-0836-38/+426
|/ / /
* | | Merge branch '21393-allow-deletion-of-protected-branches' into 'master' Phil Hughes2017-05-0821-142/+375
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add confirm delete protected branch modal Closes #21393 See merge request !11000
| * | | Add confirm delete protected branch modalSam Rose2017-05-0821-142/+375
|/ / /
* | | Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-082-7/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
| * | remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-022-7/+0
| | |
* | | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-077-49/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
| * | | Remove stubbing from Gitlab::GitalyClient::Commit specsAhmad Sherif2017-05-071-8/+3
| | | | | | | | | | | | | | | | Closes gitaly#198
| * | | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-076-41/+43
| | | |
* | | | Merge branch 'revert-58d1cd6b' into 'master' Stan Hu2017-05-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" See merge request !11153
| * | | | Revert "Merge branch ↵revert-58d1cd6bStan Hu2017-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" This reverts merge request !11150
* | | | | Merge branch 'zj-better-view-pipeline-schedule' into 'master' Kamil Trzciński2017-05-0783-413/+1841
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add Pipeline Schedules that supersedes experimental Trigger Schedule Closes #30882 See merge request !10853
| * | | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-0783-413/+1841
|/ / / /
* | | | Merge branch 'another-attempt-at-access_control_ce_spec-transient-failure' ↵Stan Hu2017-05-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Another attempt at access_control_ce_spec Closes #31827 See merge request !11123
| * | | | Another attempt at access_control_ce_specanother-attempt-at-access_control_ce_spec-transient-failureLuke "Jared" Bennett2017-05-051-1/+1
| | | | |
* | | | | Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' ↵Stan Hu2017-05-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call … See merge request !11150