summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* If migrations are pending, make CurrentSettings use existing values and ↵sh-refactor-current-settingsStan Hu2017-06-195-22/+121
| | | | | | | | | | | | | | | | | | populate missing columns with defaults master was failing because `ApplicationSetting.create_from_defaults` attempted to write to a column that did not exist in the database. This occurred in a `rake db:migrate` task, which was unable to perform the migration that would have added the missing column in the first place. In 9.3 RC2, we also had a bug where password sign-ins were disabled because there were many pending migrations. The problem occurred because `fake_application_settings` was being returned with an OpenStruct that did not include the predicate method `signup_enabled?`. As a result, the value would erroneously return `nil` instead of `true`. This commit uses the values of the defaults to mimic this behavior. This commit also refactors some of the logic to be clearer.
* Revert "Merge branch 'rs-revert-11842' into 'master'"Stan Hu2017-06-191-1/+2
| | | | | This reverts commit ad521bde1bb556709edd39d8a9aa67ee47605b91, reversing changes made to 3a38e5f1ab914bc4eaeecda6e18caaa7ca9ea5a7.
* Merge branch 'fix-atom-eslint' into 'master'Tim Zallmann2017-06-181-16/+7
|\ | | | | | | | | Fix eslint import resolver in Atom v1.18.0 See merge request !12238
| * refactor zopfli fallback configfix-atom-eslintMike Greiling2017-06-161-15/+6
| |
| * don't make assumptions about command line arguments invoking webpack configMike Greiling2017-06-161-1/+1
| |
* | Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master'Phil Hughes2017-06-172-2/+6
|\ \ | | | | | | | | | | | | | | | | | | Changed utilites imports from ~ to relative paths Closes #33485 See merge request !12026
| * | Changed utilites imports from ~ to relative pathsJose Ivan Vargas2017-06-162-2/+6
| | |
* | | Merge branch 'rs-revert-11842' into 'master'Stan Hu2017-06-161-2/+1
|\ \ \ | | | | | | | | | | | | | | | | Partially revert 1e8dbd46 See merge request !12236
| * | | Partially revert 1e8dbd46Robert Speicher2017-06-161-2/+1
| | |/ | |/| | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/33736#note_32561501
* | | Merge branch 'remove_unnecessary_spec_file' into 'master'Robert Speicher2017-06-161-102/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unnecessary spec file See merge request !12233
| * | | Remove unnecessary spec fileFelipe Artur2017-06-161-102/+0
| | | |
* | | | Merge branch 'increase-karma-socket-timeout' into 'master'Clement Ho2017-06-163-36/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase karma socket timeout Closes #33735 See merge request !12226
| * | | | Increase karma socket timeoutMike Greiling2017-06-163-36/+49
|/ / / /
* | | | Merge branch 'boards-spec-fix' into 'master'Robert Speicher2017-06-161-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes boards_spec failure Closes #33614 See merge request !12230
| * | | | Fixes boards_spec failureboards-spec-fixPhil Hughes2017-06-161-4/+4
| | | | | | | | | | | | | | | | | | | | Closes #33614
* | | | | Merge branch 'fix-overflow-slash-commands' into 'master'Annabel Dunstone Gray2017-06-162-0/+15
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixed overflow on mobile screens for the slash commands Closes #29013 See merge request !12100
| * | | | Fixed overflow on mobile screens for the slash commandsJose Ivan Vargas Lopez2017-06-162-0/+15
|/ / / /
* | | | Merge branch 'backport-panels-styles-from-ee' into 'master'Annabel Dunstone Gray2017-06-161-42/+48
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Backport panels.scss styles from EE See merge request !12206
| * | | Backport panels styles from EEbackport-panels-styles-from-eeEric Eastwood2017-06-151-42/+48
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/blob/43a570dcf5cbd0a98572d5601e9000e906791db0/app/assets/stylesheets/framework/panels.scss
* | | | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-1624-52/+271
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add table for files in merge request diffs See merge request !12047
| * | | | Add table for files in merge request diffsSean McGivern2017-06-1624-52/+271
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty.
* | | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-165-32/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764
| * | | | Make the GroupFinder specs more strictToon Claes2017-06-152-21/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the results match exactly and project authorizations do allow access to sibling groups/projects deeper down. Also apply WHERE scopes before running the UNION, to increase performance.
| * | | | Better exception message and some additional code commentToon Claes2017-06-151-1/+3
| | | | |
| * | | | Subgroups page should show groups authorized through inheritanceToon Claes2017-06-155-26/+93
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user is authorized to a group, they are also authorized to see all the ancestor groups and descendant groups. When a user is authorized to a project, they are authorized to see all the ancestor groups too. Closes #32135 See merge request !11764
* | | | Merge branch '33779-reset-session-before-blocking-requests' into 'master'Robert Speicher2017-06-162-6/+9
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Call Capybara.reset_sessions! before block_and_wait_for_requests_complete Closes #33779 See merge request !12224
| * | | Call Capybara.reset_sessions! before block_and_wait_for_requests_complete33779-reset-session-before-blocking-requestsRémy Coutable2017-06-162-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capybara/rspec already calls Capybara.reset_sessions! in an `after` hook, but `block_and_wait_for_requests_complete` is called before it so by calling it explicitely here, we prevent any new requests from being fired. See https://github.com/teamcapybara/capybara/blob/ffb41cfad620de1961bb49b1562a9fa9b28c0903/lib/capybara/rspec.rb#L20-L25 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-1691-292/+299
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
| * | | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-1591-292/+299
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
* | | | Merge branch 'issue_20900' into 'master'Sean McGivern2017-06-1621-347/+182
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove issuable drag and drop and sorting from milestone view Closes #20900 See merge request !11950
| * | | | Improve method names and add more specsFelipe Artur2017-06-1611-35/+63
| | | | |
| * | | | Migration - Remove position field from issues and merge requestsFelipe Artur2017-06-164-3/+15
| | | | |
| * | | | Remove old specs and add new onesFelipe Artur2017-06-167-39/+44
| | | | |
| * | | | Order merge requests by priorityFelipe Artur2017-06-168-156/+10
| | | | |
| * | | | Order issues by priorityFelipe Artur2017-06-167-16/+18
| | | | |
| * | | | Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-169-153/+87
| | |/ / | |/| |
* | | | Merge branch '33739-blame-legend-bottom-border' into 'master'Annabel Dunstone Gray2017-06-161-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing bottom border to blame age legend Closes #33739 See merge request !12205
| * | | | Add missing bottom border to blame age legendJeff Stubler2017-06-151-0/+1
| | | | |
* | | | | Merge branch 'bvl-missing-translations' into 'master'Douwe Maan2017-06-1627-98/+1981
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Missing translations for the project & repository pages. Closes #33420 See merge request !12052
| * | | | Small refactoring plus fixes for Spanish translations.Ruben Davila2017-06-156-25/+18
| | | | |
| * | | | Add translation for the verb 'Revert'Bob Van Landuyt2017-06-154-4/+13
| | | | |
| * | | | Take timezone into account when comparing dates in the UIBob Van Landuyt2017-06-152-2/+2
| | | | |
| * | | | Regenerate po-filesBob Van Landuyt2017-06-152-2/+2
| | | | |
| * | | | Add context to the `with_stage` stringsBob Van Landuyt2017-06-154-19/+22
| | | | |
| * | | | Add context for commit_box titleBob Van Landuyt2017-06-154-18/+27
| | | | |
| * | | | Remove HTML from translation keyBob Van Landuyt2017-06-153-20/+22
| | | | |
| * | | | Don't translate `Commit#change_type_title` nowBob Van Landuyt2017-06-151-3/+2
| | | | |
| * | | | `merge request` instead of `merge-request`Bob Van Landuyt2017-06-151-2/+2
| | | | |
| * | | | Add some context to JS translationsBob Van Landuyt2017-06-154-18/+17
| | | | |
| * | | | Small update for Spanish translationRuben Davila2017-06-152-3/+3
| | | | |
View Lorry Controller Status