Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix Rubocop errornote-background-job | Josh Frye | 2016-01-28 | 1 | -3/+3 |
| | |||||
* | Update tests | Josh Frye | 2016-01-28 | 2 | -3/+27 |
| | |||||
* | [WIP] Background process note logic for #3948 | Josh Frye | 2016-01-28 | 4 | -18/+45 |
| | |||||
* | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 18 | -22/+205 |
|\ | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376 | ||||
| * | Align filter dropdown.issue_2406 | Rubén Dávila | 2016-01-27 | 1 | -0/+4 |
| | | |||||
| * | Remove no longer required CSS rule. | Rubén Dávila | 2016-01-20 | 1 | -4/+0 |
| | | |||||
| * | Refactor some CSS rules. | Rubén Dávila | 2016-01-20 | 2 | -6/+17 |
| | | |||||
| * | Some fixes from last code review. | Rubén Dávila | 2016-01-20 | 4 | -5/+5 |
| | | |||||
| * | Some CSS and sorting fixes. | Rubén Dávila | 2016-01-20 | 3 | -19/+30 |
| | | |||||
| * | Fix broken spec. | Rubén Dávila | 2016-01-20 | 1 | -1/+3 |
| | | |||||
| * | Add specs for Forks listing. | Rubén Dávila | 2016-01-20 | 2 | -0/+40 |
| | | |||||
| * | Add icon for private forks notice. #2406 | Rubén Dávila | 2016-01-20 | 3 | -2/+16 |
| | | |||||
| * | Add ability to sort forks. #2406 | Rubén Dávila | 2016-01-20 | 2 | -4/+7 |
| | | |||||
| * | aligns menu at top on one row | Jacob Schatz | 2016-01-20 | 2 | -10/+26 |
| | | |||||
| * | changing projects css | Jacob Schatz | 2016-01-20 | 1 | -1/+0 |
| | | |||||
| * | WIP: Add sort dropdown. #2406 | Rubén Dávila | 2016-01-20 | 1 | -0/+20 |
| | | |||||
| * | Little update to copy and custom content for empty results. #2406 | Rubén Dávila | 2016-01-20 | 1 | -8/+13 |
| | | |||||
| * | Show last commit as description. #2406 | Rubén Dávila | 2016-01-20 | 3 | -4/+10 |
| | | |||||
| * | Fix broken specs. #2406 | Rubén Dávila | 2016-01-20 | 2 | -6/+4 |
| | | |||||
| * | Add ability to filter by namespace. #2406 | Rubén Dávila | 2016-01-20 | 2 | -12/+20 |
| | | |||||
| * | Use adequate icon for Forks link on sidebar. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | |||||
| * | Show forks counter on listing. #2406 | Rubén Dávila | 2016-01-20 | 3 | -2/+10 |
| | | |||||
| * | Add fork button and implement ability to distinguish between public and ↵ | Rubén Dávila | 2016-01-20 | 2 | -2/+26 |
| | | | | | | | | protected forks. #2406 | ||||
| * | Use Project creator's avatar in fork listing. #2406 | Rubén Dávila | 2016-01-20 | 5 | -4/+12 |
| | | |||||
| * | Setup new fork link in sidebar and routes. #2406 | Rubén Dávila | 2016-01-20 | 9 | -10/+20 |
| | | |||||
* | | Merge branch 'issue_5546' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 7 | -2/+111 |
|\ \ | | | | | | | | | | | | | | | | | | | Save list sort in a cookie Closes #5546 See merge request !2537 | ||||
| * | | Make default sorting preference work for Issues and MRs.issue_5546 | Rubén Dávila | 2016-01-22 | 3 | -4/+16 |
| | | | |||||
| * | | Merge branch 'master' into issue_5546 | Rubén Dávila | 2016-01-22 | 167 | -958/+2863 |
| |\ \ | |||||
| * | | | Make sorting preference reusable for all projects. | Rubén Dávila | 2016-01-22 | 8 | -14/+43 |
| | | | | |||||
| * | | | Make cookie suffix more simpler. | Rubén Dávila | 2016-01-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Little refactor plus some specs. | Rubén Dávila | 2016-01-21 | 6 | -12/+52 |
| | | | | |||||
| * | | | Remember last sort option used. | Rubén Dávila | 2016-01-20 | 5 | -2/+30 |
| | | | | |||||
* | | | | Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into ↵ | Dmitriy Zaporozhets | 2016-01-28 | 2 | -12/+20 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix preventing migration from crashing in very specific cases Closes #12606. Closes #12501. /cc @yorickpeterse @dbalexandre See merge request !2600 | ||||
| * | | | | Use ActiveRecord::Base.connection.active? and rescue any exception in ↵fix-preventing-migration-from-crashing-in-specific-cases | Rémy Coutable | 2016-01-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect_to_db? This ensures that rake tasks that don't need a DB connection can be run without one. | ||||
| * | | | | Only create the defaults ApplicationSetting when DB is fully migrated | Rémy Coutable | 2016-01-28 | 1 | -19/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a fake application settings OpenStruct when this is not the case. Also, use ActiveRecord::Base.connection_pool.active_connection? instead of ActiveRecord::Base.connection.active? to avoid driver exception. | ||||
| * | | | | Ensure rake tasks that don't need a DB connection can be run without one | Rémy Coutable | 2016-01-26 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using ActiveRecord::Base.connection.active? without a DB connection, we get a "PG::ConnectionBad: could not connect to server" error because ActiveRecord::Base.connection doesn't exist. By using ActiveRecord::Base.connected? we ensure we don't get this error if the connection is missing, which is the all point of the Gitlab::CurrentSettings#connect_to_db? method! | ||||
| * | | | | Fix preventing migration from crashing in very specific cases | Rémy Coutable | 2016-01-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details | ||||
* | | | | | Merge branch 'improve-mr-api' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 4 | -268/+221 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve consistency and duplication for Merge Request API * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #4759 and #11810 See merge request !2639 | ||||
| * | | | | | Improve consistency and duplication for Merge Request APIimprove-mr-api | Dmitriy Zaporozhets | 2016-01-28 | 4 | -268/+221 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Merge branch 'sort-text-removed-from-sort-dropdown' into 'master' | Jacob Schatz | 2016-01-28 | 7 | -8/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed sorted text from dropdowns ![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png) Closes #12796 cc @creamzy @jschatz1 See merge request !2635 | ||||
| * | | | | | | Removed sorted text from dropdowns | Phil Hughes | 2016-01-28 | 7 | -8/+7 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Closes #12796 | ||||
* | | | | | | Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes ol margin big enough for 3 digits. Fixes #7960 ![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png) See merge request !2608 | ||||
| * | | | | | | Makes ol margin big enough for 3 digits.numbered-list-rendering-in-comments-cuts-off | Jacob Schatz | 2016-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7960 | ||||
* | | | | | | | Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 2 | -0/+4 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds feature: Ajax Close/Open updates discussion automatically Triggers jQuery event <br/> Fixes #5544 See merge request !2610 | ||||
| * | | | | | | Adds comment about event listenerfeature/jschatz1/instant-issuable-history | Jacob Schatz | 2016-01-26 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Adds feature: Ajax Close/Open updates discussion automatically | Jacob Schatz | 2016-01-26 | 2 | -0/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Triggers jQuery event Fixes #5544 | ||||
* | | | | | | Update gitlab-workhorse versions in documentation | Robert Speicher | 2016-01-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | Update CHANGELOG | Robert Speicher | 2016-01-27 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | Merge branch 'update-ruby-2.2.4' into 'master' | Douwe Maan | 2016-01-27 | 11 | -22/+44 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Ruby version to 2.2.4 (latest previous stable) and update docs Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340 See merge request !2534 | ||||
| * | | | | | | updated README to include Ruby 2.1 | James Lopez | 2016-01-27 | 1 | -1/+1 |
| | | | | | | |