summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated testsci-page-ui-updatePhil Hughes2016-06-101-1/+1
|
* Fixed merge conflict that caused tests to fail with buildPhil Hughes2016-06-101-1/+1
|
* Fixed failing testsPhil Hughes2016-06-101-2/+4
|
* CI build page UI updatePhil Hughes2016-06-1016-250/+306
| | | | | Added sidebar Removed elements not present in design
* Merge branch 'cs-issue-pr-templates' into 'master' Rémy Coutable2016-06-102-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Issue/PR Templates to deter issues/contributions on the GitHub mirror of the project ## What does this MR do? Adds GitHub-specific `ISSUE_TEMPLATE.md` and `PULL_REQUEST_TEMPLATE.md` files in a `.github` directory. To prevent new issues/PRs, I figured it'd be good to direct users/contributors to open issues/contribute code in the "correct" project. ## Are there points in the code the reviewer needs to double check? Wording/phrasing, mostly. ## Why was this MR needed? The GitHub issue tracker is being closed, and PRs on GitHub haven't been accepted for a while now. This was discussed briefly during the GitLab Strategy Session at the Austin Summit. cc: @dzaporozhets @rymai @MrChrisW @dblessing @virtuacreative @amara See merge request !4324
| * Address feedback about wording.cs-issue-pr-templatesConnor Shea2016-06-092-4/+4
| |
| * Add ISSUE_TEMPLATE.md and PULL_REQUEST_TEMPLATE.md to point contributors ↵Connor Shea2016-06-092-0/+6
| | | | | | | | | | | | toward the GitLab.com repository. This adds templates for Issues/Pull Requests in a `.github` directory. These only effect issues/PRs opened in the GitHub mirror of the GitLab project. As we're shutting these down, I thought it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.
* | Merge branch 'enable-rubocop-for-migrations' into 'master' Douwe Maan2016-06-10343-1/+344
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable RuboCop for migrations ## What does this MR do? Enable RuboCop for all files inside `db/migrate`, then add magic comments to all existing files, so that this only affects new migrations. ## Are there points in the code the reviewer needs to double check? This entire change is a config change and a bunch of comments. ## Why was this MR needed? ``` Yorick Peterse [11:55 AM] I don't think we have any use case for nested def, might as well blacklist it Sean McGivern [11:57 AM] http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Lint/NestedMethodDefinition Sean McGivern [11:57 AM] hmm, it's already enabled Sean McGivern [11:57 AM] ... because we exclude `db/` from rubocop :slightly_smiling_face: Douwe Maan [11:57 AM] @smcgivern: heh Sean McGivern [11:59 AM] I guess that's because we don't want to change the old migrations? I wonder if it's worth enabling it and adding magic comments to all the previous ones to ignore rubocop Douwe Maan [11:59 AM] @smcgivern: agreed ``` ## What are the relevant issue numbers? None. ## Screenshots (if relevant) None, but if I remove the magic comment from the migration `20160416182152_convert_award_note_to_emoji_award.rb` I get: ``` $ be rubocop Inspecting 1959 files ..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................W.................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... Offenses: db/migrate/20160416182152_convert_award_note_to_emoji_award.rb:3:5: W: Lint/NestedMethodDefinition: Method definitions must not be nested. Use lambda instead. def up ... ^^^^^^ 1959 files inspected, 1 offense detected ``` ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4559
| * | Enable RuboCop for migrationsenable-rubocop-for-migrationsSean McGivern2016-06-09343-1/+344
| |/ | | | | | | | | | | | | Migrations shouldn't fail RuboCop checks - especially lint checks, such as the nested method check. To avoid changing code in existing migrations, add the magic comment to the top of each of them to skip that file.
* | Merge branch 'gh-rate-limit' into 'master' Douwe Maan2016-06-102-57/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap all rate limiting logic inside GitHub API client ## What does this MR do? Move the actual rate limiting logic to GitHub API to clean the code inside the GitHub importer, and avoid code duplication. ## Are there points in the code the reviewer needs to double check? No there aren't. ## Why was this MR needed? Avoid code duplication to handle API rate limit in every call to the GitHub API. ## What are the relevant issue numbers? There are none. ## Screenshots (if relevant) Not relevant. See merge request !4552
| * | Wrap all rate limiting logic inside GitHub API clientgh-rate-limitDouglas Barbosa Alexandre2016-06-092-57/+40
| |/
* | Merge branch '18447-investigate-smtp-error' into 'master' Douwe Maan2016-06-101-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing `EmailOnPush` spec. Closes #18447 - This should fix CI on master /cc @smcgivern @ayufan @stanhu @pacoguzman See merge request !4582
| * | Fix failing `EmailOnPush` spec.Timothy Andrew2016-06-101-2/+2
|/ /
* | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-096-19/+17
|\ \ | | | | | | | | | | | | | | | | | | Award emoji fixes Fixes #18357 #18325 and #18424 See merge request !4550
| * | Minor MR comment fixes.Fatih Acet2016-06-101-6/+6
| | | | | | | | | | | | | | | | | | yes -> true no -> false . frequent -> .frequent-emojis
| * | Ignore frequent emojis in search.award-emoji-fixesFatih Acet2016-06-091-2/+2
| | |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0914-101/+156
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-092-18/+99
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0933-151/+309
| |\ \ \
| * | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-094-11/+8
| | | | |
| * | | | Render frequent emoji block once.Fatih Acet2016-06-091-1/+3
| | | | |
| * | | | Instantiate awardsHandler in application main script.Fatih Acet2016-06-092-2/+1
| | | | |
* | | | | Update CHANGELOG for 8.8.4 and 8.8.5Robert Speicher2016-06-091-4/+6
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'fix-issue-15259-postgresql' into 'master' Robert Speicher2016-06-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibility !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL. Closes #15259 See merge request !4577
| * | | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibilityfix-issue-15259-postgresqlStan Hu2016-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL. Closes #15259
* | | | | | Merge branch 'milestone-tooltip' into 'master' Jacob Schatz2016-06-096-6/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add milestone expire date to the right sidebar ## What does this MR do? Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed. ## Are there points in the code the reviewer needs to double check? `common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17355 ## Screencast ![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif) See merge request !4448
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-0916-119/+255
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0954-182/+542
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0949-85/+224
| |\ \ \ \ \
| * | | | | | Fixes for MR comments.Fatih Acet2016-06-094-5/+5
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-08244-2438/+5858
| |\ \ \ \ \ \
| * | | | | | | Copy changes for milestone due dates.Fatih Acet2016-06-083-3/+3
| | | | | | | |
| * | | | | | | Revert milestone_remaining_days helper.Fatih Acet2016-06-081-10/+5
| | | | | | | |
| * | | | | | | Use title attribute instead of data-original-title.Fatih Acet2016-06-082-4/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-06199-1196/+4637
| |\ \ \ \ \ \ \
| * | | | | | | | Favor the ternary operator. :police_car:Fatih Acet2016-06-061-1/+1
| | | | | | | | |
| * | | | | | | | Update CHANGELOG.Fatih Acet2016-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add milestone expire date to the right sidebar.
| * | | | | | | | Show milestone remaining tooltip in right sidebar.Fatih Acet2016-06-033-9/+27
| | | | | | | | |
| * | | | | | | | Added a new common util called $.timefor.Fatih Acet2016-06-031-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will use $.timeago behind the scene and it does the opposite of what $.timeago does. $.timefor("Thu Jun 05 2016 23:40:39 GMT+0300 (EEST)") will return "3 days remaining".
* | | | | | | | | Merge branch 'autocomplete-comment-fix' into 'master' Jacob Schatz2016-06-091-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks for undefined when inserting autocomplete into textarea ## What does this MR do? Correctly checks for undefined before inserting anything into the textarea when using autocomplete. This happens because the loading indicator tries to insert `@undefined` which we dont want to insert. See merge request !4561
| * | | | | | | | | Checks based on whether data is loaded not undefinedPhil Hughes2016-06-091-1/+4
| | | | | | | | | |
| * | | | | | | | | Checks for undefined when inserting autocomplete into textareaPhil Hughes2016-06-091-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix_issue_15259' into 'master' Stan Hu2016-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug with SQL syntax error during backup restoration ## What does this MR do? It properly escapes the table name in the `DROP TABLE IF EXISTS ...` statement used during restore of a backup. ## Are there points in the code the reviewer needs to double check? Please check compatibility with PostgreSQL ## Why was this MR needed? Fix an issue with backups can not be restored if MySQL is used as database for GitLab. ## What are the relevant issue numbers? #15259 ## Screenshots (if relevant) - See merge request !4318
| * | | | | | | | | Fix bug with SQL syntax error during backup restorationDaniel Beyer2016-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #15259
* | | | | | | | | | Merge branch 'fix-empty-user-projects-snippets-list' into 'master' Jacob Schatz2016-06-090-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix empty user projects snippets list ## What are the relevant issue numbers? Closes #17952 #17816 and #17737 cc: @lbennett @jschatz1 See merge request !4532
| * | | | | | | | | | fix empty user projects snippets listBartholomew2016-06-081-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dz-improve-ui-consistency-2' into 'master' Jacob Schatz2016-06-0917-82/+71
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ui consistency. Part 2 * Use responsive top-area on project branches and tags pages * Use default button size in the content list controls * Improve button margin for btn-grouped css class For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 See merge request !4536
| * | | | | | | | | | | Remove icons from button on wiki pages. Also consistent padding between ↵dz-improve-ui-consistency-2Dmitriy Zaporozhets2016-06-086-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buttons there Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Improve buttons size and paddings in the listsDmitriy Zaporozhets2016-06-085-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Use responsive top-area on project branches and tags pagesDmitriy Zaporozhets2016-06-082-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>