summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Back dating of issues when creating throught the APIZeger-Jan van de Weg2016-03-284-6/+23
| | | | |
* | | | | Merge pull request #9978 from fantasywind/patch-2Achilleas Pipinellis2016-03-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Update github.md
| * | | | Update github default callback urlChia Yu Pai2016-03-011-2/+1
| | | | |
| * | | | Update github.mdChia Yu Pai2016-01-151-0/+1
| | | | | | | | | | | | | | | add default callback URL path
* | | | | Merge branch 'issue_14671' into 'master' Stan Hu2016-03-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cancel button on issuables Fixes #14671 See merge request !3417
| * | | | | Fix cancel linkissue_14671Alfredo Sumaran2016-03-281-1/+1
|/ / / / /
* | | | | Merge branch 'upgrade-web-console' into 'master' Robert Speicher2016-03-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade web-console to 2.3.0 Rails 5 compatibility release. [See the Changelog for more information](https://github.com/rails/web-console/releases/tag/v2.3.0). Working towards #14286. See merge request !3400
| * | | | | Upgrade web-console to 2.3.0connorshea2016-03-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5 compatibility release. See the Changelog for more information: https://github.com/rails/web-console/releases/tag/v2.3.0
* | | | | | Merge branch 'upgrade-font-awesome' into 'master' Robert Speicher2016-03-271-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade font-awesome-rails to 4.5.0.1 Includes Rails 5 support. [See Changelog for details](https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1). Working towards #14286. See merge request !3399
| * | | | | | Upgrade font-awesome-rails to 4.5.0.1connorshea2016-03-241-2/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes Rails 5 support. See changelog for details: https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1
* | | | | | Merge branch 'upgrade-brakeman' into 'master' Robert Speicher2016-03-272-12/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Brakeman from 3.1.4 to 3.2.1 Includes support for Rails 5, bug fixes, and various additional vulnerability checks. [See Changelog for more information](https://github.com/presidentbeef/brakeman/blob/master/CHANGES). Working towards #14286. See merge request !3397
| * | | | | | Upgrade Brakeman from 3.1.4 to 3.2.1connorshea2016-03-242-12/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes support for Rails 5, bug fixes, and various additional vulnerability checks. See Changelog for more information (https://github.com/presidentbeef/brakeman/blob/master/CHANGES)
* | | | | | Merge branch 'upgrade-teaspoon' into 'master' Robert Speicher2016-03-272-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Teaspoon from 1.0.1 to 1.1.5. Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md). Working towards #14286. See merge request !3409
| * | | | | | Upgrade Teaspoon from 1.0.1 to 1.1.5.connorshea2016-03-252-4/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
* | | | | | Merge branch 'upgrade-bullet' into 'master' Robert Speicher2016-03-271-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Bullet to 5.0.0 Includes Rails 5 support. [See changelog for details](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md). Working towards #14286. See merge request !3396
| * | | | | | Upgrade Bullet to 5.0.0connorshea2016-03-241-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Includes Rails 5 support. See changelog for details (https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
* | | | | | Merge branch 'bug-in-webhooks-documentation-14660' into 'master' Achilleas Pipinellis2016-03-271-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in webhooks docs See merge request !3416
| * | | | | | Fix typos in webhooks docs. Achilleas Pipinellis2016-03-271-5/+4
|/ / / / / / | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14660
* | | | | | Merge branch 'handle-avatar-in-empty-repo' into 'master' Stan Hu2016-03-274-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to look up an avatar in repo if repo directory does not exist Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/ Closes #14580 See merge request !3390
| * | | | | | Don't attempt to look up an avatar in repo if repo directory does not existStan Hu2016-03-254-0/+15
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Closes #14580
* | | | | | Merge branch 'feature/fuzz-search-min-width' into 'master' Jacob Schatz2016-03-261-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fuzzy search dropdown UI element min-width (issue 14644) Short project names sometimes result in an unusable fuzzy search UI element. Therefore, I added a min-width CSS property with a value of 175px. See here for details but it's fairly straight forward: https://gitlab.com/gitlab-org/gitlab-ce/issues/14644 Before: <br /> ![Screen_Shot_2016-03-25_at_20.03.54](/uploads/2bdc048bd818cdcd228bb2d19a10b5d2/Screen_Shot_2016-03-25_at_20.03.54.png) After: <br /> ![Screen_Shot_2016-03-25_at_20.19.29](/uploads/be23938757f67ffebb96c9bdc8229c5b/Screen_Shot_2016-03-25_at_20.19.29.png) See merge request !3407
| * | | | | | short project names result in unusable fuzz search UI elements, so added a ↵Grant Douglas2016-03-251-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | min-width property to the css Added a space between property colon and value to satisfy linter and pass build.
* | | | | | Bump VERSIONDmitriy Zaporozhets2016-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'feature--preferences-dashboard-groups' of ↵Dmitriy Zaporozhets2016-03-266-3/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/eliasw/gitlab-ce
| * | | | | | Implementing 'Groups View' and 'TODOs View' as options for dashboard ↵Elias Werberich2016-03-246-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preferences. Fixes #14585.
* | | | | | | Merge branch 'rs-remove-release-docs' into 'master' Dmitriy Zaporozhets2016-03-268-585/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove release docs from the CE repository More detailed, updated, and accurate versions of these docs now live in https://gitlab.com/gitlab-org/release-tools Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2346 [ci skip] See merge request !3393
| * | | | | | | Remove release docs from the CE repositoryrs-remove-release-docsRobert Speicher2016-03-248-585/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More detailed, updated, and accurate versions of these docs now live in https://gitlab.com/gitlab-org/release-tools [ci skip]
* | | | | | | | Merge branch 'ci-setup-info' into 'master' Dmitriy Zaporozhets2016-03-265-1/+44
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to CI setup documentation from project settings and builds pages For #14483 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3384
| * | | | | | | rescue Rugged::ReferenceError in Repository#gitlab_ci_yml methodci-setup-infoDmitriy Zaporozhets2016-03-252-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | For some reason this test fails without javascript so added itDmitriy Zaporozhets2016-03-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Make sure Repository#gitlab_ci_yml is safe to use even when repository is ↵Dmitriy Zaporozhets2016-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Small refactoring and rewordingDmitriy Zaporozhets2016-03-252-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Use head tree (cached) for file search. Also add some testsDmitriy Zaporozhets2016-03-242-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Detect build setup state based on gitlab_ci.yml presenseDmitriy Zaporozhets2016-03-243-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add links to CI setup documentation from project settings and builds pagesDmitriy Zaporozhets2016-03-243-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'fix-link-colors' into 'master' Jacob Schatz2016-03-256-47/+63
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link colors after recent UI refactoring cc @jschatz1 See merge request !3404
| * | | | | | | Using class for specificity instead of tag.Jacob Schatz2016-03-251-1/+1
| | | | | | | |
| * | | | | | | Make sure ci status colors are same and respected on most pagesfix-link-colorsDmitriy Zaporozhets2016-03-251-44/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Repository breadcrumbs and file header links should be darkDmitriy Zaporozhets2016-03-252-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix link colors by using content-list for commitsDmitriy Zaporozhets2016-03-253-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Make sure CI status icons have same color across all appDmitriy Zaporozhets2016-03-251-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'clarify_lfs' into 'master' Achilleas Pipinellis2016-03-251-0/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify LFS configuration A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default. See merge request !3388
| * | | | | | Clarify LFS configurationDrew Blessing2016-03-241-0/+4
| | | | | | |
* | | | | | | Describe CI stuff.Sytse Sijbrandij2016-03-241-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'issue_14610' into 'master' Robert Speicher2016-03-241-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Fix cancel button on issuable edit form See merge request !3392
| * | | | | Fix link when issuable is newAlfredo Sumaran2016-03-241-1/+1
| | | | | |
| * | | | | Fix cancel link on issuable edit formissue_14610Alfredo Sumaran2016-03-241-1/+1
|/ / / / /
* | | | | Merge branch ↵Douwe Maan2016-03-245-31/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix-comments-on-confidential-issues-show-activity-feed-for-non-members' into 'master' Comments on confidential issues doesn't show in activity feed to non-members Closes #14568 See merge request !3375
| * | | | | Rename `Event#proper?` to `Event#visible_to_user?`Douglas Barbosa Alexandre2016-03-244-25/+25
| | | | | |
| * | | | | Comments on confidential issues doesn't show in activity feed to non-membersDouglas Barbosa Alexandre2016-03-243-16/+49
|/ / / / /